diff --git a/client/css/style.css b/client/css/style.css
index c229c553..4a3fc87f 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -17,7 +17,9 @@ h2 {
 .user {
 	color: #f00;
 	cursor: pointer;
-	-webkit-user-select: none;
+}
+.user:hover {
+	color: #999;
 }
 #wrap,
 #viewport {
@@ -232,20 +234,20 @@ h2 {
 	}
 	#viewport {
 		-webkit-transition: -webkit-transform .2s ease-out;
-			transition:         transform .2s ease-out;
+		        transition:         transform .2s ease-out;
 		-webkit-transform: translateX(0);
-			transform: translateX(0);
+		        transform: translateX(0);
 		height: 100%;
 		margin-left: -200px;
 		width: 100%;
 	}
 	#viewport.left {
 		-webkit-transform: translateX(200px);
-			transform: translateX(200px);
+		        transform: translateX(200px);
 	}
 	#viewport.right {
 		-webkit-transform: translateX(-160px);
-			transform: translateX(-160px);
+		        transform: translateX(-160px);
 	}
 	#chat {
 		width: 100%;
@@ -293,4 +295,4 @@ h2 {
 	#chat .users a {
 		line-height: 1.8em;
 	}
-}
\ No newline at end of file
+}
diff --git a/client/index.html b/client/index.html
index 7f08c89e..6fc55e80 100644
--- a/client/index.html
+++ b/client/index.html
@@ -39,7 +39,6 @@
 				<input type="checkbox" value="nick"/>
 				<input type="checkbox" value="quit"/>
 				<input type="checkbox" value="mode"/>
-				<input type="checkbox" value="kick"/>
 			</div>
 			</div>
 		</div>
diff --git a/client/js/chat.js b/client/js/chat.js
index 91a2c305..04b95d9e 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -215,9 +215,17 @@ $(function() {
 		});
 	});
 	
+	chat.on("mousedown", ".user", function(e) {
+		return false;
+	});
+
 	chat.on("dblclick", ".user", function() {
 		var link = $(this);
 		var id = parseInt(link.closest(".window").attr("id").replace("window-", ""));
+		var name = link.text().trim();
+		if (name == "-!-" || name.indexOf(".") != -1) {
+			return;
+		}
 		socket.emit("input", {
 			id: id,
 			text: "/whois " + link.text().trim(),
diff --git a/client/js/lib/jquery.tabComplete.js b/client/js/lib/jquery.tabComplete.js
index c8bde39a..966b98ca 100644
--- a/client/js/lib/jquery.tabComplete.js
+++ b/client/js/lib/jquery.tabComplete.js
@@ -11,7 +11,7 @@
 (function($) {
 	$.fn.tabComplete = function(list, options) {
 		var settings = $.extend({
-			appendSpace: false,
+			after: '',
 			caseSensitive: false,
 		}, options);
 		
@@ -56,11 +56,10 @@
 			}
 			
 			if (match.length) {
-				last = match[i];
+				text.push(match[i]);
+				self.val(text.join(' ') + settings.after);
 			}
 			
-			text.push(last);
-			self.val(text.join(' ') + (settings.appendSpace ? ' ' : ''));
 			return false;
 		});
 	};