diff --git a/modules/m_services.c b/modules/m_services.c
index c1536e3e2..a74695c71 100644
--- a/modules/m_services.c
+++ b/modules/m_services.c
@@ -302,9 +302,8 @@ h_svc_whois(hook_data_client *data)
 		if(*p == '\0')
 			p = data->target->user->suser;
 
-		sendto_one(data->client, form_str(RPL_WHOISLOGGEDIN),
-				get_id(&me, data->client),
-				get_id(data->client, data->client),
+		sendto_one_numeric(data->client, RPL_WHOISLOGGEDIN,
+				form_str(RPL_WHOISLOGGEDIN),
 				data->target->name, p);
 	}
 }
diff --git a/src/messages.tab b/src/messages.tab
index 90a0b2264..ca196302a 100644
--- a/src/messages.tab
+++ b/src/messages.tab
@@ -351,7 +351,7 @@ static  const char *  replies[] = {
 /* 327 */       NULL,
 /* 328 RPL_CHANNELURL */	NULL,
 /* 329 RPL_CREATIONTIME, */	":%s 329 %s %s %lu", 
-/* 330 RPL_WHOISLOGGEDIN */	":%s 330 %s %s %s :is logged in as",
+/* 330 RPL_WHOISLOGGEDIN */	"%s %s :is logged in as",
 /* 331 RPL_NOTOPIC, */          ":%s 331 %s %s :No topic is set.",
 /* 332 RPL_TOPIC, */            ":%s 332 %s %s :%s",
 /* 333 RPL_TOPICWHOTIME, */     ":%s 333 %s %s %s %lu",