diff --git a/irc/accounts.go b/irc/accounts.go
index 00f76d00..f2d13f76 100644
--- a/irc/accounts.go
+++ b/irc/accounts.go
@@ -1157,7 +1157,7 @@ func (am *AccountManager) applyVHostInfo(client *Client, info VHostInfo) {
 	updated := client.SetVHost(vhost)
 	if updated {
 		// TODO: doing I/O here is kind of a kludge
-		go client.sendChghost(oldNickmask, vhost)
+		go client.sendChghost(oldNickmask, client.Hostname())
 	}
 }
 
diff --git a/irc/client.go b/irc/client.go
index c0110764..af91f03e 100644
--- a/irc/client.go
+++ b/irc/client.go
@@ -749,13 +749,6 @@ func (client *Client) updateNick(nick, nickCasefolded, skeleton string) {
 	client.updateNickMaskNoMutex()
 }
 
-// updateNickMask updates the nickmask.
-func (client *Client) updateNickMask() {
-	client.stateMutex.Lock()
-	defer client.stateMutex.Unlock()
-	client.updateNickMaskNoMutex()
-}
-
 // updateNickMaskNoMutex updates the casefolded nickname and nickmask, not acquiring any mutexes.
 func (client *Client) updateNickMaskNoMutex() {
 	client.hostname = client.getVHostNoMutex()