diff --git a/members/member-password.pl b/members/member-password.pl
index d44f29d0f7..a1f50aaea2 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -55,7 +55,7 @@ if ( ( $patron_id ne $loggedinuser ) && ( $category_type eq 'S' ) ) {
 
 push( @errors, 'NOMATCH' ) if ( ( $newpassword && $newpassword2 ) && ( $newpassword ne $newpassword2 ) );
 
-if ( $newpassword and not @errors) {
+if ( defined($newpassword) and not @errors) {
 
     output_and_exit( $input, $cookie, $template,  'wrong_csrf_token' )
         unless Koha::Token->new->check_csrf({
@@ -64,10 +64,12 @@ if ( $newpassword and not @errors) {
         });
 
     try {
-        $patron->set_password({ password => $newpassword });
+        if ( $newpassword ne '' ) {
+            $patron->set_password({ password => $newpassword });
+            $template->param( newpassword => $newpassword );
+        }
         $patron->userid($new_user_id)->store
             if $new_user_id and $new_user_id ne $patron->userid;
-        $template->param( newpassword => $newpassword );
         if ( $destination eq 'circ' ) {
             print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=" . $patron->cardnumber);
         }