diff --git a/upload/login.php b/upload/login.php
index 73857ae10..bf453e18c 100644
--- a/upload/login.php
+++ b/upload/login.php
@@ -108,7 +108,8 @@ if (IS_GUEST || $mod_admin_login)
 		'ADMIN_LOGIN'     => $mod_admin_login,
 		'REDIRECT_URL'    => htmlCHR($redirect_url),
 		'CAPTCHA_HTML'    => ($need_captcha) ? CAPTCHA()->get_html() : '',
-		'PAGE_TITLE'  => $lang['LOGIN'],
+		'PAGE_TITLE'      => $lang['LOGIN'],
+		'S_LOGIN_ACTION'  => "login.php",
 	));
 
 	print_page('login.tpl');
diff --git a/upload/templates/default/login.tpl b/upload/templates/default/login.tpl
index 7db6eb152..f43135db2 100644
--- a/upload/templates/default/login.tpl
+++ b/upload/templates/default/login.tpl
@@ -4,8 +4,6 @@
 <form action="{S_LOGIN_ACTION}" method="post">
 
 <input type="hidden" name="redirect" value="{REDIRECT_URL}" />
-<input type="hidden" name="cookie_test" value="{COOKIE_TEST_VAL}" />
-{S_HIDDEN_FIELDS}
 <!-- IF ADMIN_LOGIN --><input type="hidden" name="admin" value="1" /><!-- ENDIF -->
 
 <p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
@@ -17,19 +15,24 @@
 <tr>
 	<td class="row1">
 
-	<!-- IF ERR_MSG -->
-	<h4 class="warnColor1 tCenter mrg_16">{ERR_MSG}</h4>
+	<!-- IF LOGIN_ERR_MSG -->
+	<h4 class="warnColor1 tCenter mrg_16">{LOGIN_ERR_MSG}</h4>
+	<!-- ELSEIF ADMIN_LOGIN -->
+	<h4 class="tCenter mrg_16">Для получения доступа к мод/админ опциям необходимо еще раз ввести пароль</h4>
+	<!-- ELSE -->
+	<h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4>
 	<!-- ENDIF -->
 
+
 	<div class="mrg_16">
 	<table class="borderless bCenter">
 	<tr>
 		<td width="35%" align="right">{L_USERNAME}:</td>
-		<td><input type="text" class="post" name="login_username" size="25" maxlength="40" value="{USERNAME}" <!-- IF ADMIN_LOGIN -->readonly="readonly" style="color: gray"<!-- ENDIF --> /></td>
+		<td><input type="text" class="post" name="login_username" size="25" maxlength="40" value="{LOGIN_USERNAME}" tabindex="101"<!-- IF ADMIN_LOGIN --> readonly="readonly" style="color: gray"<!-- ENDIF --> /></td>
 	</tr>
 	<tr>
 		<td align="right">{L_PASSWORD}:</td>
-		<td><input type="password" class="post" name="login_password" size="25" maxlength="32" /></td>
+		<td><input type="password" class="post" name="login_password" value="{LOGIN_PASSWORD}" tabindex="102" size="25" maxlength="32" /></td>
 	</tr>
 	<!-- IF CAPTCHA_HTML -->
 	<tr>
@@ -38,10 +41,7 @@
 	</tr>
 	<!-- ENDIF -->
 	<tr>
-		<td colspan="2" class="tCenter nowrap">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" <!-- IF ADMIN_LOGIN || AUTOLOGIN_DISABLED -->disabled="disabled"<!-- ELSE -->checked="checked"<!-- ENDIF --> /></td>
-	</tr>
-	<tr>
-		<td colspan="2" class="warnColor1 tCenter" style="<!-- IF COOKIES_ERROR -->font-size: 24px;<!-- ENDIF -->">{L_COOKIES_REQUIRED}</td>
+		<td colspan="2" class="tCenter nowrap">{L_AUTO_LOGIN}: <input type="checkbox" name="autologin" tabindex="103"<!-- IF ADMIN_LOGIN || AUTOLOGIN_DISABLED --> disabled="disabled"<!-- ELSE -->checked="checked"<!-- ENDIF --> /></td>
 	</tr>
 	<tr>
 		<td colspan="2" class="tCenter pad_6"><input type="submit" name="login" class="bold long" value="{L_LOGIN}" /></td>