diff --git a/useradmin/CHANGELOG b/useradmin/CHANGELOG
index 0bbba7517..87a321b95 100644
--- a/useradmin/CHANGELOG
+++ b/useradmin/CHANGELOG
@@ -56,3 +56,5 @@ Created a page for exporting groups to a batch file, for importing on other syst
 Added support for creating, deleting and modifying groups from a batch file. This is similar to the long-standing batch user management functionality.
 Added support for Blowfish password hashing, which can be enabled on the Module Config page. On Solaris systems, it will be used if enabled in /etc/security/policy.conf. Requires the Crypt::Eksblowfish::Bcrypt Perl module though.
 Converted commands in the module's API file to POD format, and added more details about each function.
+---- Changes since 1.470 ----
+Fixed a bug that caused an empty shell to appear in the shells list for new users.
diff --git a/useradmin/edit_user.cgi b/useradmin/edit_user.cgi
index b3bcec267..0ac188847 100755
--- a/useradmin/edit_user.cgi
+++ b/useradmin/edit_user.cgi
@@ -140,16 +140,16 @@ print &ui_table_row(&hlink($text{'home'}, "home"),
 	$homefield);
 
 # Show shell drop-down
-push(@shlist, $uinfo{'shell'}) if (%uinfo && $uinfo{'shell'});
+push(@shlist, $uinfo{'shell'}) if ($n ne "" && $uinfo{'shell'});
 if ($access{'shells'} ne "*") {
 	# Limit to shells from ACL
-	@shlist = %uinfo ? ($uinfo{'shell'}) : ();
+	@shlist = $n ne "" ? ($uinfo{'shell'}) : ();
 	push(@shlist, split(/\s+/, $access{'shells'}));
 	$shells = 1;
 	}
 $shells = 1 if ($access{'noother'});
 @shlist = &unique(@shlist);
-if (%uinfo && !$uinfo{'shell'}) {
+if ($n ne "" && !$uinfo{'shell'}) {
 	# No shell!
 	push(@shlist, [ "", "<None>" ]);
 	}
@@ -163,8 +163,8 @@ print &ui_table_row(&hlink($text{'shell'}, "shell"),
 	   ($shells ? "" : &ui_filebox("othersh", undef, 40, 1)));
 
 # Get the password, generate random if needed
-$pass = %uinfo ? $uinfo{'pass'} : $config{'lock_string'};
-if (!%uinfo && $config{'random_password'}) {
+$pass = $n ne "" ? $uinfo{'pass'} : $config{'lock_string'};
+if ($n eq "" && $config{'random_password'}) {
 	&seed_random();
 	foreach (1 .. 15) {
 		$random_password .= $random_password_chars[
@@ -174,7 +174,7 @@ if (!%uinfo && $config{'random_password'}) {
 
 # Check if temporary locking is supported
 if (&supports_temporary_disable()) {
-	if (%uinfo && $pass ne $config{'lock_string'} && $pass ne "") {
+	if ($n ne "" && $pass ne $config{'lock_string'} && $pass ne "") {
 		# Can disable if not already locked, or if a new account
 		$can_disable = 1;
 		if ($pass =~ /^\Q$disable_string\E/) {
@@ -182,7 +182,7 @@ if (&supports_temporary_disable()) {
 			$pass =~ s/^\Q$disable_string\E//;
 			}
 		}
-	elsif (!%uinfo) {
+	elsif ($n eq "") {
 		$can_disable = 1;
 		}
 	}