diff --git a/core/css/styles.css b/core/css/styles.css
index 1a521019d9..3e150152b5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -413,6 +413,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #personal-show + label {
 	margin-top: 1em;
 	margin-left: -3em;
+	display:inline !important;
 }
 #passwordbutton {
 	margin-left: .5em;
diff --git a/core/js/jquery-showpassword.js b/core/js/jquery-showpassword.js
index e1737643b4..a4373ec82b 100644
--- a/core/js/jquery-showpassword.js
+++ b/core/js/jquery-showpassword.js
@@ -38,7 +38,11 @@
 					'tabindex' 	:	$element.attr('tabindex'),
 					'autocomplete'	:	'off'
 				});
-					
+
+				if($element.attr('placeholder') !== undefined) {
+					$clone.attr('placeholder', $element.attr('placeholder'));
+				}
+
 				return $clone;
 			
 			};