diff --git a/client/index.html b/client/index.html
index ab1f9b29..c14eaec2 100644
--- a/client/index.html
+++ b/client/index.html
@@ -79,6 +79,12 @@
 							<div class="col-sm-12">
 								<h2>Network settings</h2>
 							</div>
+							<div class="col-sm-3">
+								<label>Name</label>
+							</div>
+							<div class="col-sm-9">
+								<input class="input" name="name" value="Freenode">
+							</div>
 							<div class="col-sm-3">
 								<label>Server</label>
 							</div>
@@ -111,9 +117,10 @@
 							<div class="col-sm-3">
 								<label>Nick</label>
 							</div>
-							<div class="col-sm-9">
+							<div class="col-sm-5">
 								<input class="input" name="nick" value="shout-user">
 							</div>
+							<div class="clearfix"></div>
 							<div class="col-sm-3">
 								<label>Real Name</label>
 							</div>
diff --git a/client/js/shout.js b/client/js/shout.js
index bcbd7939..94b361ee 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -197,12 +197,7 @@ $(function() {
 		$("#connect")
 			.find(".btn")
 			.prop("disabled", false)
-			.end()
-			.find("input")
-			.each(function() {
-				var self = $(this);
-				self.val(self.data("default"));
-			});
+			.end();
 	});
 
 	socket.on("nick", function(data) {
@@ -238,13 +233,6 @@ $(function() {
 			.html(render("user", data));
 	});
 
-	$("#connect")
-		.find("input")
-		.each(function() {
-			var self = $(this);
-			self.data("default", self.val());
-		});
-
 	$.cookie.json = true;
 
 	var settings = $("#settings");