4 files changed, 26 insertions, 32 deletions
diff --git a/modules/user/user-rtl.css b/modules/user/user-rtl.css
index 498d6cb25..5a1442c1c 100644
--- a/modules/user/user-rtl.css
+++ b/modules/user/user-rtl.css
@@ -7,19 +7,18 @@
 /**
  * Password strength indicator.
  */
-input.password-field {
-  margin-left: 10px;
-  margin-right: 0;
+.password-strength {
+  float: left;
 }
-input.password-confirm {
-  margin-left: 10px;
-  margin-right: 0;
+.password-strength-text {
+  float: left;
 }
-.password-strength-title {
-  float: right;
+div.password-confirm {
+  float: left;
 }
+.confirm-parent,
 .password-parent {
-  float: right;
+  clear: right;
 }
 
 /* Generated by user.module but used by profile.module: */
diff --git a/modules/user/user.css b/modules/user/user.css
index 60f93bf56..d6ed7c366 100644
--- a/modules/user/user.css
+++ b/modules/user/user.css
@@ -57,8 +57,10 @@ input.password-field {
   margin-bottom: 0.4em;
 }
 div.password-confirm {
-  display: inline;
-  padding-left: 1em;
+  float: right;  /* LTR */
+  margin-top: 1.5em;
+  visibility: hidden;
+  width: 17em;
 }
 div.form-item div.password-suggestions {
   padding: 0.2em 0.5em;
@@ -69,19 +71,11 @@ div.form-item div.password-suggestions {
 div.password-suggestions ul {
   margin-bottom: 0;
 }
+.confirm-parent,
 .password-parent {
+  clear: left; /* LTR */
   margin: 0;
-  width: 34.3em;
-}
-
-/**
- * Password confirmation checker.
- */
-.confirm-parent {
-  margin: 0;
-}
-div.password-confirm {
-  visibility: hidden;
+  width: 36.3em;
 }
 
 /* Generated by user.module but used by profile.module: */
diff --git a/modules/user/user.js b/modules/user/user.js
index 8755c4326..44c00f344 100644
--- a/modules/user/user.js
+++ b/modules/user/user.js
@@ -16,7 +16,7 @@ Drupal.behaviors.password = {
       innerWrapper.addClass('password-parent');
 
       // Add the password confirmation layer.
-      $('input.password-confirm', outerWrapper).after('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').parent().addClass('confirm-parent');
+      $('input.password-confirm', outerWrapper).parent().prepend('<div class="password-confirm">' + translate['confirmTitle'] + ' <span></span></div>').addClass('confirm-parent');
       var confirmInput = $('input.password-confirm', outerWrapper);
       var confirmResult = $('div.password-confirm', outerWrapper);
       var confirmChild = $('span', confirmResult);
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 75e43b052..d3cca0718 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1066,25 +1066,26 @@ div.messages {
 
 /* -------------- Password Meter  ------------- */
 
+.confirm-parent,
+.password-parent {
+  width: 34em;
+}
 .password-parent,
 div.form-item div.password-suggestions {
   position: relative;
-  width: auto;
 }
-#password-strength {
-  float: none;
-  left: 16em;
-  position: absolute;
-  width: 11.5em;
-}
-#password-strength-text,
+.password-strength-text,
 .password-strength-title,
 div.password-confirm {
   font-size: 0.82em;
 }
-#password-strength-text {
+.password-strength-text {
   margin-top: 0.2em;
 }
+div.password-confirm {
+  margin-top: 2.2em;
+  width: 20.73em;
+}
 
 /* ---------------- Buttons    ---------------- */