diff --git a/irc/nickserv.go b/irc/nickserv.go
index acfbb8f6..05ea59ee 100644
--- a/irc/nickserv.go
+++ b/irc/nickserv.go
@@ -1146,7 +1146,6 @@ func nsConfirmPassword(server *Server, account, passphrase string) (errorMessage
 func nsPasswdHandler(service *ircService, server *Server, client *Client, command string, params []string, rb *ResponseBuffer) {
 	var target string
 	var newPassword string
-	var checkPassword string
 	var errorMessage string
 
 	var oper *Oper
@@ -1172,10 +1171,9 @@ func nsPasswdHandler(service *ircService, server *Server, client *Client, comman
 			newPassword = ""
 		}
 
-		// fix #1883 Nickserv gives error when user attempt to change password to *
-		checkPassword = params[2]
+		checkPassword := params[2]
 		if checkPassword == "*" {
-			checkPassword = ""
+			checkPassword = "" // #1883
 		}
 
 		if target == "" {