diff --git a/lib/server.js b/lib/server.js
index 9764f3c..43194f1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -227,7 +227,15 @@ function input(data) {
 	
 	case "join":
 		if (client && args[1]) {
-			client.join(args.slice(1));
+			if (!args[2] || args[2].charAt(0) == "#") {
+				client.join(args.slice(1));
+			} else {
+				console.log(args[1], args[2]);
+				client.join(
+					args[1],
+					args[2] // Password
+				);
+			}
 		}
 		break;