diff --git a/webmin/change_session.cgi b/webmin/change_session.cgi
index b188525bd..b229a3fe1 100755
--- a/webmin/change_session.cgi
+++ b/webmin/change_session.cgi
@@ -49,13 +49,15 @@ if ($in{'logouttime_on'}) {
 		&error($text{'session_elogouttime'});
 	}
 $miniserv{'logouttime'} = $in{'logouttime_on'} ? $in{'logouttime'} : undef;
-if ($in{'localauth'}) {
-	$lsof = &has_command("lsof");
-	&error($text{'session_elsof'}) if (!$lsof);
-	$miniserv{'localauth'} = $lsof;
-	}
-else {
-	delete($miniserv{'localauth'});
+if (defined($in{'localauth'})) {
+	if ($in{'localauth'}) {
+		$lsof = &has_command("lsof");
+		&error($text{'session_elsof'}) if (!$lsof);
+		$miniserv{'localauth'} = $lsof;
+		}
+	else {
+		delete($miniserv{'localauth'});
+		}
 	}
 $miniserv{'no_pam'} = $in{'no_pam'};
 if ($in{'passwd_file'}) {
@@ -84,13 +86,15 @@ else {
 		&error($text{'session_ecmd'});
 	$gconfig{'passwd_cmd'} = $in{'cmd'};
 	}
-if ($in{'extauth'}) {
-	$in{'extauth'} =~ /^(\S+)/ && -x $1 ||
-		&error($text{'session_eextauth'});
-	$miniserv{'extauth'} = $in{'extauth'};
-	}
-else {
-	delete($miniserv{'extauth'});
+if (defined($in{'extauth'})) {
+	if ($in{'extauth'}) {
+		$in{'extauth'} =~ /^(\S+)/ && -x $1 ||
+			&error($text{'session_eextauth'});
+		$miniserv{'extauth'} = $in{'extauth'};
+		}
+	else {
+		delete($miniserv{'extauth'});
+		}
 	}
 if (defined($in{'passwd_mode'})) {
 	$miniserv{'passwd_mode'} = $in{'passwd_mode'};
diff --git a/webmin/edit_session.cgi b/webmin/edit_session.cgi
index 4f14cfc7e..b27f71484 100755
--- a/webmin/edit_session.cgi
+++ b/webmin/edit_session.cgi
@@ -81,11 +81,13 @@ print &ui_table_row($text{'session_banner'},
 		    [ 0, $text{'session_banner0'} ] ]).
 	&ui_filebox("banner", $gconfig{'loginbanner'}, 50));
 
-# Local authentication
-print &ui_table_row($text{'session_local'},
-	&ui_radio("localauth", $miniserv{'localauth'} ? 1 : 0,
-		  [ [ 0, $text{'session_localoff'}."<br>" ],
-		    [ 1, $text{'session_localon'} ] ]));
+# Local authentication (deprecated)
+if ($miniserv{'localauth'}) {
+	print &ui_table_row($text{'session_local'},
+		&ui_radio("localauth", $miniserv{'localauth'} ? 1 : 0,
+			  [ [ 0, $text{'session_localoff'}."<br>" ],
+			    [ 1, $text{'session_localon'} ] ]));
+	}
 
 # Use PAM or shadow file?
 print &ui_table_row($text{'session_pam'},
@@ -122,9 +124,11 @@ print &ui_table_row($text{'session_pmodedesc3'},
 		    [ 1, $text{'session_pmode1'}."<br>" ],
 		    [ 2, $text{'session_pmode2'} ] ]));
 
-# Squid-style authentication program
-print &ui_table_row($text{'session_extauth'},
-	&ui_textbox("extauth", $miniserv{'extauth'}, 60));
+# Squid-style authentication program (deprecated)
+if ($miniserv{'extauth'}) {
+	print &ui_table_row($text{'session_extauth'},
+		&ui_textbox("extauth", $miniserv{'extauth'}, 60));
+	}
 
 # Password encryption format
 print &ui_table_row($text{'session_md5'},