diff --git a/mbtask/taskibc.c b/mbtask/taskibc.c
index f2d8062e..5b189cb7 100644
--- a/mbtask/taskibc.c
+++ b/mbtask/taskibc.c
@@ -1138,7 +1138,7 @@ void command_join(char *hostname, char *parameters)
         }
     }
 
-    nick = strtok(parameters, " \0");
+    nick = strtok(parameters, "@\0");
     server = strtok(NULL, " \0");
     channel = strtok(NULL, "\0");
 
@@ -1193,7 +1193,7 @@ void command_part(char *hostname, char *parameters)
 	}
     }
 
-    nick = strtok(parameters, " \0");
+    nick = strtok(parameters, "@\0");
     server = strtok(NULL, " \0");
     channel = strtok(NULL, "\0");