diff --git a/client/js/shout.js b/client/js/shout.js
index f7e1884..bcbd793 100644
--- a/client/js/shout.js
+++ b/client/js/shout.js
@@ -40,7 +40,6 @@ $(function() {
 		};
 	}
 
-	// Request notification permissions if we don't already have it
 	if (Notification.permission !== "granted") {
 		Notification.requestPermission();
 	}
@@ -100,24 +99,22 @@ $(function() {
 	socket.on("init", function(data) {
 		if (data.networks.length === 0) {
 			$("#footer").find(".connect").trigger("click");
-			return;
+		} else {
+			sidebar.find(".networks").html(
+				render("network", {
+					networks: data.networks
+				})
+			);
+			var channels = $.map(data.networks, function(n) {
+				return n.channels;
+			});
+			chat.html(
+				render("chat", {
+					channels: channels
+				})
+			);
 		}
 
-		sidebar.find(".networks").html(
-			render("network", {
-				networks: data.networks
-			})
-		);
-
-		var channels = $.map(data.networks, function(n) {
-			return n.channels;
-		});
-		chat.html(
-			render("chat", {
-				channels: channels
-			})
-		);
-
 		sidebar.find(".empty").hide();
 		$("body").removeClass("signed-out");
 		$("#sign-in").detach();
diff --git a/src/server.js b/src/server.js
index d568a5f..514bc0d 100644
--- a/src/server.js
+++ b/src/server.js
@@ -101,7 +101,7 @@ function auth(data) {
 		var success = false;
 		_.each(manager.clients, function(client) {
 			if (client.config.user == data.user) {
-				if (bcrypt.compareSync(data.password, client.config.password)) {
+				if (bcrypt.compareSync(data.password || "", client.config.password)) {
 					init(socket, client);
 					success = true;
 				}