diff --git a/server/src/main/resources/static/client.js b/server/src/main/resources/static/client.js
index e92bd51..632c93c 100644
--- a/server/src/main/resources/static/client.js
+++ b/server/src/main/resources/static/client.js
@@ -257,6 +257,9 @@ var vm = new Vue({
 				this.opponentScore = 0;
 			}
 		}
+	},
+	mounted: function() {
+		document.getElementById('nicknameInput').focus();
 	}
 });
 
diff --git a/server/src/main/resources/static/index.html b/server/src/main/resources/static/index.html
index 79a9c41..d5d9098 100644
--- a/server/src/main/resources/static/index.html
+++ b/server/src/main/resources/static/index.html
@@ -15,7 +15,7 @@
       <div class="body row nofooter">
         <div v-show="!username" class="form">
           <h2>What is your name?</h2>
-          <input id="nicknameInput" type="text" class="form-control" maxlength="16" autofocus>
+          <input id="nicknameInput" type="text" class="form-control" maxlength="16">
           <p class="error-message">{{ usernameError }}</p>
         </div>
         <div v-show="username">