Index: src/IRCConnection.h
==================================================================
--- src/IRCConnection.h
+++ src/IRCConnection.h
@@ -99,16 +99,16 @@
 - (void)leaveChannel: (IRCChannel*)channel
 	  withReason: (OFString*)reason;
 - (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;
 - (void)process;
 - (void)handleConnection;

Index: src/IRCConnection.m
==================================================================
--- src/IRCConnection.m
+++ src/IRCConnection.m
@@ -131,33 +131,33 @@
 {
 	[self sendLineWithFormat: @"PRIVMSG %@ :%@", channel.name, msg];
 }
 
 - (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
 	 toChannel: (IRCChannel*)channel
 {
 	[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_
 {
 	[self sendLineWithFormat: @"NICK %@", nickname_];