diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 29102afc..bea9f6f7 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -74,6 +74,9 @@ irc_nickserv (server *serv, char *cmd, char *arg1, char *arg2, char *arg3)
 		case LOGIN_NICKSERV:
 			tcp_sendf (serv, "NICKSERV %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
 			break;
+		default: /* This may not work but at least it tries something when using /id or /ghost cmd */
+			tcp_sendf (serv, "NICKSERV %s %s%s%s\r\n", cmd, arg1, arg2, arg3);
+			break;
 #if 0
 		case LOGIN_MSG_NS:
 			tcp_sendf (serv, "PRIVMSG NS :%s %s%s%s\r\n", cmd, arg1, arg2, arg3);