diff --git a/lang/chs/lang_settings.php b/lang/chs/lang_settings.php
index 6834eea2..af3185a0 100644
--- a/lang/chs/lang_settings.php
+++ b/lang/chs/lang_settings.php
@@ -692,6 +692,7 @@ $lang_settings = array
 	'row_login_type' => '登录方式',
 	'text_login_type_normal' => '正常',
 	'text_login_type_secret' => '秘密',
+	'text_login_type_warning' => '当游客访问方式不为正常时，必须使用秘密登录才能登录',
 	'row_login_secret' => '登录密钥',
 	'text_login_secret_current' => '当前密钥',
 	'text_login_url_with_secret' => '登录链接',
diff --git a/lang/cht/lang_settings.php b/lang/cht/lang_settings.php
index fb46d73e..cf2c62a7 100644
--- a/lang/cht/lang_settings.php
+++ b/lang/cht/lang_settings.php
@@ -692,6 +692,7 @@ $lang_settings = array
 	'row_login_type' => '登錄方式',
 	'text_login_type_normal' => '正常',
 	'text_login_type_secret' => '秘密',
+	'text_login_type_warning' => '當遊客訪問方式不為正常時，必須使用秘密登錄才能登錄',
 	'row_login_secret' => '登錄密鑰',
 	'text_login_secret_current' => '當前密鑰',
 	'text_login_url_with_secret' => '登錄鏈接',
diff --git a/lang/en/lang_settings.php b/lang/en/lang_settings.php
index becd6e43..d05af6f9 100644
--- a/lang/en/lang_settings.php
+++ b/lang/en/lang_settings.php
@@ -692,6 +692,7 @@ $lang_settings = array
 	'row_login_type' => 'Login type',
 	'text_login_type_normal' => 'Normal',
 	'text_login_type_secret' => 'Secret',
+	'text_login_type_warning' => "When 'Guest visit' != Normal, user can only login through the 'Secret' way",
 	'row_login_secret' => 'Login secret',
 	'text_login_secret_current' => 'Current secret',
 	'text_login_url_with_secret' => 'Login URL',
diff --git a/public/login.php b/public/login.php
index 7fa262ea..4bc09be1 100644
--- a/public/login.php
+++ b/public/login.php
@@ -9,7 +9,7 @@ if ($langid)
 	if(get_langfolder_cookie() != $lang_folder)
 	{
 		set_langfolder_cookie($lang_folder);
-		header("Location: " . $_SERVER['PHP_SELF']);
+		header("Location: " . $_SERVER['REQUEST_URI']);
 	}
 }
 require_once(get_langfile_path("", false, $CURLANGDIR));
@@ -29,7 +29,8 @@ foreach ($langs as $row)
 }
 $s .= "\n</select>";
 ?>
-<form method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+<form method="get" action="<?php echo $_SERVER['REQUEST_URI'] ?>">
+    <input type="hidden" name="secret" value="<?php echo $_GET['secret'] ?? '' ?>">
 <?php
 print("<div align=\"right\">".$lang_login['text_select_lang']. $s . "</div>");
 ?>
diff --git a/public/settings.php b/public/settings.php
index aaf7c8ff..cc499984 100644
--- a/public/settings.php
+++ b/public/settings.php
@@ -330,6 +330,7 @@ elseif ($action == 'securitysettings')	//security settings
 
 	$loginTypeRadio = '<label><input type="radio" name="login_type" value="normal"' . (empty($SECURITY['login_type']) || $SECURITY['login_type'] == 'normal' ? ' checked' : '') . ' onclick="document.getElementById(\'tbody_login_secret\').style.display=\'none\';">' . $lang_settings['text_login_type_normal'] . '</label>';
 	$loginTypeRadio .= '<label><input type="radio" name="login_type" value="secret"' . ($SECURITY['login_type'] == 'secret' ? ' checked' : '') . ' onclick="document.getElementById(\'tbody_login_secret\').style.display=\'table-row-group\';">' . $lang_settings['text_login_type_secret'] . '</label>';
+	$loginTypeRadio .= sprintf('<b style="color: #DC143C; margin-left: 20px">%s</b>', $lang_settings['text_login_type_warning']);
 	tr($lang_settings['row_login_type'], $loginTypeRadio, 1);
 
 	print '</tbody><tbody id="tbody_login_secret" style="display: ' . ($SECURITY['login_type'] == 'secret' ? 'table-row-group' : 'none') . '">';