diff --git a/client/css/style.css b/client/css/style.css
index ed3441d..ae6af23 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -108,11 +108,12 @@ h2 {
 }
 #chat .users {
 	border-left: 1px solid #ccc;
-	float: right;
-	height: 100%;
-	margin-top: 36px;
+	bottom: 26px;
 	overflow-y: auto;
-	padding-top: 6px;
+	padding: 4px 0;
+	position: absolute;
+	right: 0px;
+	top: 36px;
 	width: 159px;
 }
 #chat .users .user {
@@ -125,7 +126,7 @@ h2 {
 	bottom: 26px;
 	left: 0;
 	overflow-y: auto;
-	padding: 6px 0;
+	padding: 4px 0;
 	position: absolute;
 	right: 160px;
 	top: 36px;
diff --git a/client/index.html b/client/index.html
index 735b8b8..fdb63c8 100644
--- a/client/index.html
+++ b/client/index.html
@@ -42,7 +42,7 @@
 
 	<script type="text/html" id="users">
 	{{#users}}
-	<div class="user" data-id="{{id}}">
+	<div class="user">
 		{{mode}}{{name}}
 	</div>
 	{{/users}}
diff --git a/client/js/chat.js b/client/js/chat.js
index 7599532..f91498e 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -56,7 +56,6 @@ $(function() {
 		case "users":
 			target = target.find(".users");
 			target.html(Mustache.render(users, {users: data.data}));
-			console.log("RENDER USERS");
 			break;
 
 		case "messages":
diff --git a/lib/models.js b/lib/models.js
index a1afa43..9c916ec 100644
--- a/lib/models.js
+++ b/lib/models.js
@@ -11,7 +11,7 @@ var id = 1;
 models.User = Backbone.Model.extend({
 	defaults: {
 		mode: "",
-		name: "user"
+		name: ""
 	}
 });
 
diff --git a/lib/server.js b/lib/server.js
index ab07797..6952f96 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -84,6 +84,13 @@ function handleInput(input) {
 		}
 		break;
 
+	case "NAMES":
+		var irc = target.network.irc;
+		if (argv[1] && typeof irc !== "undefined") {
+			irc.send("NAMES", argv[1]);
+		}
+		break;
+
 	case "SERVER":
 	case "CONNECT":
 		if (argv[1]) {
@@ -130,16 +137,10 @@ function handleEvent(argv) {
 
 	case "JOIN":
 		if (argv.nick == network.get("nick")) {
-			var channel = new models.Channel({
-				name: argv.args[0]
-			});
-			channel.get("users").add(
-				new models.User({
-					name: network.get("nick")
-				})
-			)
 			channels.add(
-				channel
+				new models.Channel({
+					name: argv.args[0]
+				})
 			);
 		} else {
 			var channel = channels.findWhere({name: argv.args[0]});
@@ -179,6 +180,31 @@ function handleEvent(argv) {
 			);
 		}
 		break;
+
+	case "rpl_namreply":
+		var names   = argv.args[3].split(' ');
+		var channel = network.get("channels").findWhere({name: argv.args[2]});
+		var users   = channel.get("users");
+
+		if (names[0] == network.get("nick")) {
+			users.reset();
+		}
+		for (var i in names) {
+			users.add(
+				new models.User({name: names[i]}), {
+					silent: true
+				}
+			);
+		}
+		break;
+
+	case "rpl_endofnames":
+		var channel = network.get("channels").findWhere({name: argv.args[1]});
+		var users = channel.get("users");
+		users.trigger(
+			"add", {}, users
+		);
+		break;
 	}
 
 	// Debug