diff --git a/server.go b/server.go
index 315de2f..f31e75a 100644
--- a/server.go
+++ b/server.go
@@ -148,7 +148,7 @@ func (sv *Server) dispatcher() {
 		case cl := <-sv.addq:
 			clid := strings.ToLower(cl.Name())
 			if _, exists := sv.clients[clid]; exists {
-				cl.Receive(irc.M("", ERR_NICKNAMEINUSE, cl.Name(), "Nickname is already in use"))
+				cl.Receive(irc.M(sv.host, ERR_NICKNAMEINUSE, cl.Name(), "Nickname is already in use"))
 				go func() {
 					time.Sleep(5 * time.Second)
 					cl.Register(false)
@@ -157,7 +157,7 @@ func (sv *Server) dispatcher() {
 				continue
 			}
 			if !sv.authCallback(cl.Name(), cl.Password()) {
-				cl.Receive(irc.M("", ERR_PASSWDMISMATCH, cl.Name(), "Password incorrect"))
+				cl.Receive(irc.M(sv.host, ERR_PASSWDMISMATCH, cl.Name(), "Password incorrect"))
 				go func() {
 					time.Sleep(5 * time.Second)
 					cl.Register(false)