diff --git a/mysql/edit_user.cgi b/mysql/edit_user.cgi
index ad5eaf865..82604e6c1 100755
--- a/mysql/edit_user.cgi
+++ b/mysql/edit_user.cgi
@@ -58,12 +58,12 @@ print &ui_table_row($text{'user_user'},
 
 # Password field
 my $master_login = ($u->[1] eq ($config{'login'} || "root"));
-my $epassfield1 = $fieldmap{'Password'} || 1e10;
-my $epassfield2 = $fieldmap{'authentication_string'} || 1e10;
+my $epassfield1 = $fieldmap{'Password'};
+my $epassfield2 = $fieldmap{'authentication_string'};
 my $plugin = $fieldmap{'plugin'};
 my $unixsocket = $plugin && $u->[$plugin] eq 'unix_socket';
-my $nopass = (($epassfield1 && !$u->[$epassfield1]) &&
-		       ($epassfield2 && !$u->[$epassfield2]));
+my $nopass = ((!defined($epassfield1) || !$u->[$epassfield1]) &&
+	      (!defined($epassfield2) || !$u->[$epassfield2]));
 my $lock_supported = defined($u->[$fieldmap{'account_locked'}]);
 $lock_supported = 0 if ($master_login);
 my $locked = $u->[$fieldmap{'account_locked'}] eq 'Y';