diff --git a/lib/server.js b/lib/server.js
index 97aeec41..18b214d0 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -225,9 +225,14 @@ function input(data) {
 		break;
 	
 	case "join":
+		if (client && args[1]) {
+			client.join(args.slice(1));
+		}
+		break;
+	
 	case "nick":
 		if (client && args[1]) {
-			client[cmd].apply(client, args.slice(1));
+			client.nick(args[1]);
 		}
 		break;
 	
@@ -256,7 +261,7 @@ function input(data) {
 		network.channels.forEach(function(c) {
 			if (c.type == "channel") part.push(c.name);
 		});
-		client.part(part.join(","));
+		client.part(part);
 		break;
 	
 	case "invite":