diff --git a/core/js/js.js b/core/js/js.js
index b237c6fcf5..93d4c0a03e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -638,9 +638,21 @@ $(document).ready(function(){
 	});
 
 	// 'show password' checkbox
-	$('#password').showPassword();
-	$('#adminpass').showPassword();	
-	$('#pass2').showPassword();
+	
+	var hideToggleBtn = function(input, label) {
+		// 'show password' checkbox
+		input.showPassword().keyup(function(){
+			if (input.val().length == 0) {
+				label.hide();
+			} else {
+				label.css("display", "inline").show();
+			}
+		});
+		label.hide();
+	};
+	hideToggleBtn($('#password'), $('label[for=show]'));
+	hideToggleBtn($('#adminpass'), $('label[for=show]'));
+	hideToggleBtn($('#pass2'), $('label[for=personal-show]'));
 
 	//use infield labels
 	$("label.infield").inFieldLabels({