diff --git a/public/src/installer/install.js b/public/src/installer/install.js
index f157f1d120..2d19a36dad 100644
--- a/public/src/installer/install.js
+++ b/public/src/installer/install.js
@@ -3,6 +3,7 @@
 
 $('document').ready(function() {
 	setupInputs();
+	$('[name="username"]').focus();
 
 
 
diff --git a/src/views/install/index.tpl b/src/views/install/index.tpl
index 3687bd400f..dc0eca5fb1 100644
--- a/src/views/install/index.tpl
+++ b/src/views/install/index.tpl
@@ -53,7 +53,7 @@
 					<label for="username">Username</label>
 					<input type="text" class="form-control" name="username" placeholder="Username" />	
 				</div>
-				<div class="col-sm-4 help-text" data-help="<strong>Enter an alphanumeric username. Spaces between words are allowed.</strong> You can always change your username later on your profile page."></div>
+				<div class="col-sm-4 help-text" data-help="Enter an <strong>alphanumeric username</strong>. Spaces between words are allowed. You can always change your username later on your profile page."></div>
 			</div>
 			<div class="row input-row">
 				<div class="col-sm-8 col-xs-12 input-field">