diff --git a/irc/nickname.go b/irc/nickname.go
index 1a1677b6..4d21738e 100644
--- a/irc/nickname.go
+++ b/irc/nickname.go
@@ -120,8 +120,7 @@ func fixupNickEqualsAccount(client *Client, rb *ResponseBuffer, config *Config)
 	if !client.registered {
 		return true
 	}
-	// don't need to supply a nickname, SetNick will use the account name
-	if !performNickChange(client.server, client, client, rb.session, "", rb) {
+	if !performNickChange(client.server, client, client, rb.session, client.AccountName(), rb) {
 		client.server.accounts.Logout(client)
 		nsNotice(rb, client.t("A client is already using that account; try logging out and logging back in with SASL"))
 		return false