diff --git a/irc/reply.go b/irc/reply.go
index 7df09b25..0648f8ba 100644
--- a/irc/reply.go
+++ b/irc/reply.go
@@ -89,7 +89,7 @@ func (reply *NumericReply) String() string {
 // names reply
 
 type NamesReply struct {
-	*BaseReply
+	BaseReply
 	channel *Channel
 }
 
diff --git a/irc/server.go b/irc/server.go
index 7eb018d8..ab171f9d 100644
--- a/irc/server.go
+++ b/irc/server.go
@@ -67,6 +67,7 @@ func (server *Server) receiveCommands(commands <-chan Command) {
 					// no-op
 				default:
 					client.Reply(ErrPasswdMismatch(server))
+					server.clients.Remove(client)
 					client.Destroy()
 					return
 				}