diff --git a/client/index.html b/client/index.html
index f52cf4f0..79e29315 100644
--- a/client/index.html
+++ b/client/index.html
@@ -128,14 +128,14 @@
 								<label>Nick</label>
 							</div>
 							<div class="col-sm-5">
-								<input class="input" id="nick" name="nick" value="<%= defaults.nick %>">
+								<input class="input nick" name="nick" value="<%= defaults.nick %>">
 							</div>
 							<div class="clearfix"></div>
 							<div class="col-sm-3">
-								<label title="* Optional">Username</label>
+								<label>Username</label>
 							</div>
 							<div class="col-sm-5">
-								<input class="input" id="username" name="username" value="<%= defaults.username %>">
+								<input class="input username" name="username" value="<%= defaults.username %>">
 							</div>
 							<div class="clearfix"></div>
 							<div class="col-sm-3">
diff --git a/client/js/shout.js b/client/js/shout.js
index 685d74b1..84a22814 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -686,9 +686,9 @@ $(function() {
 		);
 	});
 	
-	forms.on("input", "#nick", function() {
+	forms.on("input", ".nick", function() {
 		var nick = $(this).val();
-		$("#username").val(nick);
+		forms.find(".username").val(nick);
 	});
 
 	Mousetrap.bind([