diff --git a/src/modules/invite.c b/src/modules/invite.c
index 81adaf72c..44e2d6150 100644
--- a/src/modules/invite.c
+++ b/src/modules/invite.c
@@ -291,6 +291,6 @@ CMD_FUNC(cmd_invite)
 	if (!is_silenced(client, target))
 	{
 		sendto_prefix_one(target, client, NULL, ":%s INVITE %s :%s", client->name,
-			target->name, ((channel) ? (channel->chname) : parv[2]));
+			target->name, channel->chname);
 	}
 }
diff --git a/src/modules/user.c b/src/modules/user.c
index ac2bac862..8f86f2512 100644
--- a/src/modules/user.c
+++ b/src/modules/user.c
@@ -143,9 +143,6 @@ CMD_FUNC(cmd_user)
 
 	if (!MyConnect(client))
 	{
-		if (client->srvptr == NULL)
-			sendto_ops("WARNING, User %s introduced as being "
-			    "on non-existant server %s.", client->name, server);
 		client->user->server = find_or_add(client->srvptr->name);
 		strlcpy(client->user->realhost, host, sizeof(client->user->realhost));
 		goto user_finish;