diff --git a/modules/m_pass.c b/modules/m_pass.c
index 0cc0747..b66de73 100644
--- a/modules/m_pass.c
+++ b/modules/m_pass.c
@@ -83,9 +83,9 @@ mr_pass(struct Client *client_p, struct Client *source_p, int parc, const char *
 		auth_user = NULL;
 	}
 	
-	client_p->localClient->passwd = rb_strndup(pass, PASSWDLEN);
+	client_p->localClient->passwd = *pass ? rb_strndup(pass, PASSWDLEN) : NULL;
 	
-	if(auth_user)
+	if(auth_user && *auth_user)
 		client_p->localClient->auth_user = rb_strndup(auth_user, PASSWDLEN);
 
 	/* These are for servers only */
diff --git a/src/s_user.c b/src/s_user.c
index 319e933..6c81df8 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -649,11 +649,21 @@ introduce_client(struct Client *client_p, struct Client *source_p, struct User *
 			else
 				identifyservice_p = NULL;
 			if (identifyservice_p != NULL)
-				sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
-						get_id(source_p, identifyservice_p),
-						ConfigFileEntry.identifyservice,
-						ConfigFileEntry.identifycommand,
-						source_p->localClient->passwd);
+			{
+				if (!EmptyString(source_p->localClient->auth_user))
+					sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s %s",
+							get_id(source_p, identifyservice_p),
+							ConfigFileEntry.identifyservice,
+							ConfigFileEntry.identifycommand,
+							source_p->localClient->auth_user,
+							source_p->localClient->passwd);
+				else
+					sendto_one(identifyservice_p, ":%s PRIVMSG %s :%s %s",
+							get_id(source_p, identifyservice_p),
+							ConfigFileEntry.identifyservice,
+							ConfigFileEntry.identifycommand,
+							source_p->localClient->passwd);
+			}
 		}
 		memset(source_p->localClient->passwd, 0, strlen(source_p->localClient->passwd));
 		rb_free(source_p->localClient->passwd);