diff --git a/src/IRCConnection.h b/src/IRCConnection.h
index 7e355bd..8288b92 100644
--- a/src/IRCConnection.h
+++ b/src/IRCConnection.h
@@ -101,12 +101,12 @@
 - (void)sendMessage: (OFString*)msg
 	  toChannel: (IRCChannel*)channel;
 - (void)sendMessage: (OFString*)msg
-	     toUser: (IRCUser*)user;
+	     toUser: (OFString*)user;
 - (void)sendNotice: (OFString*)notice
-	    toUser: (IRCUser*)user;
+	    toUser: (OFString*)user;
 - (void)sendNotice: (OFString*)notice
 	 toChannel: (IRCChannel*)channel;
-- (void)kickUser: (IRCUser*)user
+- (void)kickUser: (OFString*)user
      fromChannel: (IRCChannel*)channel
       withReason: (OFString*)reason;
 - (void)changeNicknameTo: (OFString*)nickname;
diff --git a/src/IRCConnection.m b/src/IRCConnection.m
index 1108f36..bb2e6a3 100644
--- a/src/IRCConnection.m
+++ b/src/IRCConnection.m
@@ -133,15 +133,15 @@
 }
 
 - (void)sendMessage: (OFString*)msg
-	     toUser: (IRCUser*)user
+	     toUser: (OFString*)user
 {
-	[self sendLineWithFormat: @"PRIVMSG %@ :%@", user.nickname, msg];
+	[self sendLineWithFormat: @"PRIVMSG %@ :%@", user, msg];
 }
 
 - (void)sendNotice: (OFString*)notice
-	    toUser: (IRCUser*)user
+	    toUser: (OFString*)user
 {
-	[self sendLineWithFormat: @"NOTICE %@ :%@", user.nickname, notice];
+	[self sendLineWithFormat: @"NOTICE %@ :%@", user, notice];
 }
 
 - (void)sendNotice: (OFString*)notice
@@ -150,12 +150,12 @@
 	[self sendLineWithFormat: @"NOTICE %@ :%@", channel.name, notice];
 }
 
-- (void)kickUser: (IRCUser*)user
+- (void)kickUser: (OFString*)user
      fromChannel: (IRCChannel*)channel
       withReason: (OFString*)reason
 {
 	[self sendLineWithFormat: @"KICK %@ %@ :%@",
-				  channel.name, user.nickname, reason];
+				  channel.name, user, reason];
 }
 
 - (void)changeNicknameTo: (OFString*)nickname_