diff --git a/main.c b/main.c
index 87711c29..3e0705a0 100644
--- a/main.c
+++ b/main.c
@@ -819,7 +819,7 @@ static int start_client(int argc, char *argv[])
 	}
 
 	if (shell_machine) {
-		p = strchr(shell_machine,'@');
+		p = strrchr(shell_machine,'@');
 		if (p) {
 			*p = 0;
 			shell_user = shell_machine;