1 files changed, 4 insertions, 2 deletions
diff --git a/irc.c b/irc.c
index 73d02d2..4255bda 100644
--- a/irc.c
+++ b/irc.c
@@ -844,12 +844,14 @@ main(int argc, char *argv[])
 			port = optarg;
 			break;
 		}
+	if (!user)
+		user = "anonymous";
 	if (!nick[0] && ircnick && strlen(ircnick) < sizeof nick)
 		strcpy(nick, ircnick);
+	if (!nick[0] && strlen(user) < sizeof nick)
+		strcpy(nick, user);
 	if (!nick[0])
 		goto usage;
-	if (!user)
-		user = "anonymous";
 	tinit();
 	err = dial(server, port);
 	if (err)