diff --git a/client/css/style.css b/client/css/style.css
index be024c8c..fb8710c0 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -541,6 +541,10 @@ button {
 #sign-in .btn {
 	margin-top: 25px;
 }
+#sign-in .error {
+	color: #e74c3c;
+	margin-top: 1em;
+}
 #connect label {
 	display: block;
 	margin-top: 10px;
diff --git a/client/index.html b/client/index.html
index 90a8f80d..eca0ae6c 100644
--- a/client/index.html
+++ b/client/index.html
@@ -15,7 +15,7 @@
 	<link rel="shortcut icon" href="/img/favicon.png">
 
 	</head>
-	<body class="<%= public ? "public" : "signed-out" %>">
+	<body class="<%= public ? "public" : "" %>">
 
 	<div id="wrap">
 	<div id="viewport">
@@ -57,6 +57,9 @@
 								<input class="input" type="password" name="password">
 								</label>
 							</div>
+							<div class="col-xs-12 error" style="display: none;">
+								Authentication failed.
+							</div>
 							<div class="col-xs-12">
 								<button type="submit" class="btn">
 									Sign in
diff --git a/client/js/chat.js b/client/js/chat.js
index 5ed1ee5d..f9fcec2c 100644
--- a/client/js/chat.js
+++ b/client/js/chat.js
@@ -58,8 +58,16 @@ $(function() {
 	});
 
 	socket.on("auth", function(data) {
-		$("body").addClass("signed-out");
-		$("#sign-in input[name='user']").val($.cookie("user") || "");
+		var body = $("body");
+		var login = $("#sign-in");
+		if (body.hasClass("signed-out")) {
+			var error = login.find(".error");
+			error.show().closest("form").one("submit", function() {
+				error.hide();
+			});
+		}
+		body.addClass("signed-out");
+		login.find("input[name='user']").val($.cookie("user") || "");
 		sidebar.find(".sign-in")
 			.click()
 			.end()
diff --git a/lib/server.js b/lib/server.js
index 51d546eb..33c82c57 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -129,11 +129,16 @@ function auth(data) {
 		});
 		init(socket, client);
 	} else {
+		var success = 0;
 		_.each(clients, function(client) {
 			if (client.config.name == data.name && client.config.password == data.password) {
 				init(socket, client);
+				success++;
 			}
 		});
+		if (!success) {
+			socket.emit("auth");
+		}
 	}
 }
 
diff --git a/package.json b/package.json
index 99077771..e8a5d612 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "shout",
   "description": "A web IRC client",
-  "version": "0.8.4",
+  "version": "0.8.5",
   "homepage": "http://github.com/erming/shout",
   "author": {
     "name": "Mattias Erming",
