diff --git a/client/css/style.css b/client/css/style.css
index bbf6f1e6..8f226496 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -97,7 +97,7 @@ h2 {
 input {
 	outline: 0;
 }
-button {
+button, .user {
 	border: none;
 	background: none;
 	margin: 0;
@@ -520,7 +520,7 @@ button {
 	font: 12px Consolas, Menlo, Monaco, "Lucida Console", "DejaVu Sans Mono", "Courier New", monospace;
 	line-height: 1.4;
 }
-#chat button:hover {
+#chat button:hover, .user:hover {
 	opacity: .6;
 }
 #chat .chat,
@@ -634,8 +634,8 @@ button {
 	color: #84ce88;
 	color: #50a656;
 }
-#chat.no-colors .from button,
-#chat.no-colors .sidebar button {
+#chat.no-colors .from .user,
+#chat.no-colors .sidebar .user {
 	color: #50a656 !important;
 }
 #chat .text {
diff --git a/client/js/shout.templates.js b/client/js/shout.templates.js
index 37c9eaf4..47f8b66f 100644
--- a/client/js/shout.templates.js
+++ b/client/js/shout.templates.js
@@ -76,12 +76,12 @@ templates['msg'] = template({"1":function(depth0,helpers,partials,data) {
   return "self";
   },"3":function(depth0,helpers,partials,data) {
   var helper, helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, functionType="function";
-  return "		<button class=\"user\" style=\"color: #"
+  return "		<a href=\"#\" class=\"user\" style=\"color: #"
     + escapeExpression(((helpers.stringcolor || (depth0 && depth0.stringcolor) || helperMissing).call(depth0, (depth0 != null ? depth0.from : depth0), {"name":"stringcolor","hash":{},"data":data})))
     + "\">"
     + escapeExpression(((helper = (helper = helpers.mode || (depth0 != null ? depth0.mode : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"mode","hash":{},"data":data}) : helper)))
     + escapeExpression(((helper = (helper = helpers.from || (depth0 != null ? depth0.from : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"from","hash":{},"data":data}) : helper)))
-    + "</button>\n";
+    + "</a>\n";
 },"5":function(depth0,helpers,partials,data) {
   var stack1, helper, functionType="function", helperMissing=helpers.helperMissing, escapeExpression=this.escapeExpression, buffer = "			<div class=\"force-newline\">\n				<button id=\"toggle-"
     + escapeExpression(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : helperMissing),(typeof helper === functionType ? helper.call(depth0, {"name":"id","hash":{},"data":data}) : helper)))
diff --git a/client/views/msg.tpl b/client/views/msg.tpl
index 6d2e9d48..755f911e 100644
--- a/client/views/msg.tpl
+++ b/client/views/msg.tpl
@@ -4,7 +4,7 @@
 	</span>
 	<span class="from">
 		{{#if from}}
-		<button class="user" style="color: #{{stringcolor from}}">{{mode}}{{from}}</button>
+		<a href="#" class="user" style="color: #{{stringcolor from}}">{{mode}}{{from}}</a>
 		{{/if}}
 	</span>
 	<span class="text">