diff --git a/src/cmd_nick.cpp b/src/cmd_nick.cpp
index 3cfebea2b6..64b1a46668 100644
--- a/src/cmd_nick.cpp
+++ b/src/cmd_nick.cpp
@@ -75,7 +75,7 @@ CmdResult cmd_nick::Handle (const char** parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				user->WriteServ("433 %s %s :Nickname is already in use.",user->nick,parameters[0]);
+				user->WriteServ("433 %s %s :Nickname is already in use.", user->registered >= REG_NICK ? user->nick : "*", parameters[0]);
 				return CMD_FAILURE;
 			}
 		}