diff --git a/acl/edit_user.cgi b/acl/edit_user.cgi
index 4ea6379d1..c64f90cdb 100755
--- a/acl/edit_user.cgi
+++ b/acl/edit_user.cgi
@@ -218,6 +218,7 @@ my @overlays = grep { $_->{'overlay'} } @all;
 if ($access{'theme'}) {
 	# Current theme
 	my @topts = ( );
+	push(@topts, !$user{'theme'} ? [ '', $text{'edit_themedef'} ] : ());
 	foreach my $t (@themes) {
 		push(@topts, [ $t->{'dir'}, $t->{'desc'} ]);
 		}
diff --git a/change-user/index.cgi b/change-user/index.cgi
index 3051ecce8..9b2b68c97 100755
--- a/change-user/index.cgi
+++ b/change-user/index.cgi
@@ -75,7 +75,7 @@ if ($access{'theme'}) {
 			  [ [ 1, &text('index_themeglobal', $tname)."<br>" ],
 			    [ 0, $text{'index_themeset'} ] ])." ".
 		&ui_select("theme", $user->{'theme'},
-			[ [ '', $text{'index_themedef'} ],
+			[ !$user->{'theme'} ? [ '', $text{'index_themedef'} ] : (),
 			  map { [ $_->{'dir'}, $_->{'desc'} ] }
 			      @themes ]), undef, [ "valign=top","valign=top" ]);
 
diff --git a/usermin/edit_themes.cgi b/usermin/edit_themes.cgi
index c78039799..ef6695010 100755
--- a/usermin/edit_themes.cgi
+++ b/usermin/edit_themes.cgi
@@ -30,7 +30,8 @@ if (@themes) {
         print &ui_form_start("change_theme.cgi");
         print "<b>$text{'themes_sel'}</b>\n";
         print &ui_select("theme", $uconfig{'theme'},
-                [ map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
+                [ !$uconfig{'theme'} ? [ '', $text{'themes_default'} ] : (),
+                map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
         print &ui_form_end([ [ undef, $text{'themes_change'} ] ]);
         print &ui_tabs_end_tab("mode", "change");
 	}
diff --git a/webmin/edit_themes.cgi b/webmin/edit_themes.cgi
index 293ac739e..08524c494 100755
--- a/webmin/edit_themes.cgi
+++ b/webmin/edit_themes.cgi
@@ -37,7 +37,8 @@ if (@themes) {
 	print &ui_form_start("change_theme.cgi");
 	print "<b>$text{'themes_sel'}</b>\n";
 	print &ui_select("theme", $gtheme,
-		[ map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
+		[ !$gtheme ? [ '', $text{'themes_default'} ] : (),
+		map { [ $_->{'dir'}, $_->{'desc'} ] } @themes ]),"<p>\n";
 	print &ui_form_end([ [ undef, $text{'themes_change'} ] ]);
 	print &ui_tabs_end_tab("mode", "change");
 	}