diff --git a/server.go b/server.go
index f26ca42..9e702bc 100644
--- a/server.go
+++ b/server.go
@@ -211,13 +211,17 @@ func (s *Server) handleCommand(command string, args []string) {
 		s.reply(rplWelcome)
 		s.clientRegistered = true
 
+		// Tell the user that they themselves joined the chat channel
+		s.reply(rplJoin, s.upstreamLauncher.Self.Nick, BLESSED_CHANNEL)
+
+		// Send (initially just us) nicklist for the chat channel
+		s.reply(rplNames, BLESSED_CHANNEL, s.upstreamLauncher.Self.Nick)
+		s.reply(rplEndOfNames, BLESSED_CHANNEL)
+
 		// Spawn upstream connection
 		s.upstream = s.upstreamLauncher.Connect()
 		go s.upstreamWorker()
 
-		// Tell the user that they themselves joined the chat channel
-		s.reply(rplJoin, s.upstreamLauncher.Self.Nick, BLESSED_CHANNEL)
-
 	default:
 		s.handleRegisteredCommand(command, args)
 	}