diff --git a/upload/config.php b/upload/config.php
index ca55bbc69..ec7e6aea0 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
 $bb_cfg['tp_release_date'] = '08-01-2013';
-$bb_cfg['tp_release_state'] = 'R484';
+$bb_cfg['tp_release_state'] = 'R485';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index ffe586fc1..07c69762c 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -142,6 +142,7 @@ $lang['TERMS'] = 'Terms';
 $lang['NOTHING_HAS_CHANGED'] = 'Nothing has changed';
 $lang['AUTOCOMPLETE'] = "Password generate";
 $lang['YOUR_NEW_PASSWORD'] = "Your are new password:";
+$lang['REGENERATE'] = "Regenerate";
 
 //
 // Stats block text
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 98ffd1142..02f3a8836 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1655,7 +1655,9 @@ $lang['TERMS_OFF'] = 'Я <b>не согласен</b> с этими услови
 $lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимо включить JavaScript';
 $lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта<br /><br />вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)<br /><br />Приносим извинения за это временное неудобство";
 $lang['AUTOCOMPLETE'] = "Сгенерировать пароль";
+$lang['AUTOCOMPLETE'] = "Сгенерировать пароль";
 $lang['YOUR_NEW_PASSWORD'] = "Ваш пароль: ";
+$lang['REGENERATE'] = "Перегенерировать";
 
 
 // Debug
diff --git a/upload/templates/default/css/main.css b/upload/templates/default/css/main.css
index 9f9f2d303..331f39be2 100644
--- a/upload/templates/default/css/main.css
+++ b/upload/templates/default/css/main.css
@@ -1391,15 +1391,27 @@ div#autocomplete_popup div.title {
 
 div#autocomplete_popup div.close {
 	position: absolute;
-	right: 6px;
+	right: 7px;
 	cursor: pointer;
-	top: 2px;
+	top: 7px;
 	color: red;
 	font-weight: bold;
+	width: 12px;
+	height: 12px;
+	background: url("/images/bad.gif") transparent no-repeat;
 }
 
 div#autocomplete_popup input {
 	font-size: 16px;
 	margin: 20px 0 0;
 	width: 83px;
+}
+
+div#autocomplete_popup span.regenerate {
+	width: 16px;
+	height: 16px;
+	margin: 24px 0 0 8px;
+	background: url("/images/pic_loading.gif") transparent no-repeat;
+	cursor: pointer;
+	display: inline-block;
 }
\ No newline at end of file
diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl
index b1126cc6b..edb975aa2 100644
--- a/upload/templates/default/usercp_register.tpl
+++ b/upload/templates/default/usercp_register.tpl
@@ -13,23 +13,33 @@
 		return Math.floor(result);
 
 	};
-	jQuery(document).ready(function () {
-		jQuery("span#autocomplete").click(function () {
-			var string_result = ""; // Empty string
-			for (var i = 1; i <= 8; i++) {
-				string_result += array_for_rand_pass[array_rand(array_for_rand_pass)];
-			}
 
-			var _popup_left = (Math.ceil(window.screen.availWidth / 2) - 150);
-			var _popup_top = (Math.ceil(window.screen.availHeight / 2) - 50);
+	var autocomplete = function (noCenter) {
+		var string_result = ""; // Empty string
+		for (var i = 1; i <= 8; i++) {
+			string_result += array_for_rand_pass[array_rand(array_for_rand_pass)];
+		}
+
+		var _popup_left = (Math.ceil(window.screen.availWidth / 2) - 150);
+		var _popup_top = (Math.ceil(window.screen.availHeight / 2) - 50);
+
+		if (!noCenter) {
 			jQuery("div#autocomplete_popup").css({
 				left:_popup_left + "px",
 				top:_popup_top + "px"
 			}).show(1000);
+		} else {
+			jQuery("div#autocomplete_popup").show(1000);
+		}
 
-			jQuery("input#pass, input#pass_confirm, div#autocomplete_popup input").each(function () {
-				jQuery(this).val(string_result);
-			});
+		jQuery("input#pass, input#pass_confirm, div#autocomplete_popup input").each(function () {
+			jQuery(this).val(string_result);
+		});
+	};
+
+	jQuery(document).ready(function () {
+		jQuery("span#autocomplete").click(function() {
+			autocomplete();
 		});
 
 		/**
@@ -65,7 +75,6 @@
 
 				_X = event.clientX;
 				_Y = event.clientY;
-				console.log("X: " + _X + " Y: " + _Y);
 			}
 		});
 
@@ -80,9 +89,13 @@
 </script>
 <div id="autocomplete_popup">
 	<div class="relative">
-		<div class="close" onclick="jQuery('div#autocomplete_popup').hide();">x</div>
+		<div class="close" onclick="jQuery('div#autocomplete_popup').hide();"></div>
 		<div class="title">{L_YOUR_NEW_PASSWORD}</div>
-		<input value="" autocomplete="off" type="text"/>
+		<div>
+			<input value="" autocomplete="off" type="text"/>
+			<span class="regenerate" title="{L_REGENERATE}" onclick="autocomplete(true)"
+				  title=""></span>
+		</div>
 	</div>
 </div>
 <h1 class="pagetitle">{PAGE_TITLE}</h1>