diff --git a/server.go b/server.go
index 4001788..f583a4e 100644
--- a/server.go
+++ b/server.go
@@ -474,10 +474,12 @@ func (s *Server) DisconnectClient() {
 }
 
 func (s *Server) sendNames() {
-	names := s.upstreamLauncher.Self.Nick
+	names := s.upstreamLauncher.Self.Nick // always include ourselves
 	if s.upstream != nil {
 		for nick, _ := range s.upstream.Users {
-			names += " " + nick
+			if nick != s.upstreamLauncher.Self.Nick { // but don't repeat ourselves
+				names += " " + nick
+			}
 		}
 	}