diff --git a/server.go b/server.go
index fe1fc52..bd19f7b 100644
--- a/server.go
+++ b/server.go
@@ -798,9 +798,9 @@ func (s *Server) reply(code replyCode, args ...string) {
 		s.writeClient(fmt.Sprintf(":%s 005 %s NAMESX CHANTYPES=# :are supported by this server", s.name, s.clientNick()))
 
 	case rplJoin:
-		s.writeClient(fmt.Sprintf(":%s JOIN %s", args[0], args[1]))
+		s.writeClient(fmt.Sprintf(":%s!%s@%s JOIN %s", args[0], args[0], args[0], args[1]))
 	case rplPart:
-		s.writeClient(fmt.Sprintf(":%s PART %s %s", args[0], args[1], args[2]))
+		s.writeClient(fmt.Sprintf(":%s!%s@%s PART %s %s", args[0], args[0], args[0], args[1], args[2]))
 	case rplTopic:
 		s.writeClient(fmt.Sprintf(":%s 332 %s %s :%s", s.name, s.clientNick(), args[0], args[1]))
 	case rplNoTopic: