diff --git a/server/auth/store.go b/server/auth/store.go
index 40262c76d62b..11a663fc1186 100644
--- a/server/auth/store.go
+++ b/server/auth/store.go
@@ -493,11 +493,9 @@ func (as *authStore) UserChangePassword(r *pb.AuthUserChangePasswordRequest) (*p
 	var password []byte
 	var err error
 
-	if !user.Options.NoPassword {
-		password, err = as.selectPassword(r.Password, r.HashedPassword)
-		if err != nil {
-			return nil, ErrNoPasswordUser
-		}
+	password, err = as.selectPassword(r.Password, r.HashedPassword)
+	if err != nil {
+		return nil, ErrNoPasswordUser
 	}
 
 	updatedUser := &authpb.User{