diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index b816b03652..7d9bd5a599 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-03  Hirofumi Kosaka  <kosaka@rworks.jp>
+
+        * include/functions_html.php: Use "autocomplete=off" in all
+	password fields (this is re-apply of rev5823, that was
+	dropped at rev6607).  Merged from branch 4.x.
+
 2012-12-03  Junichi Satoh  <junichi@rworks.jp>
 
 	* godmode/setup/setup.php: Changed not to depend on DateTimeZone
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 70dbdd3bed..54c09d448a 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -579,7 +579,7 @@ function html_print_input_text_extended ($name, $value, $id, $alt, $size, $maxle
 		"onmouseup", "onmouseover", "onmousemove", "onmouseout",
 		"onkeypress", "onkeydown", "onkeyup");
 	
-	$output = '<input '.($password ? 'type="password" ' : 'type="text" ');
+	$output = '<input '.($password ? 'type="password" autocomplete="off" ' : 'type="text" ');
 	
 	if ($disabled && (!is_array ($attributes) || !array_key_exists ("disabled", $attributes))) {
 		$output .= 'readonly="readonly" ';