diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index fa034095b6..ce597f1416 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -130,3 +130,7 @@ limitations under the License.
 .mx_AuthBody_spinner {
     margin: 1em 0;
 }
+
+.mx_AuthBody_passwordScore {
+    width: 100%;
+}
diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss
index 20b1efd28b..147bb3b471 100644
--- a/res/css/views/elements/_Field.scss
+++ b/res/css/views/elements/_Field.scss
@@ -168,6 +168,7 @@ limitations under the License.
 .mx_Field_tooltip {
     margin-top: -12px;
     margin-left: 4px;
+    width: 200px;
 }
 
 .mx_Field_tooltip.mx_Field_valid {
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index 21c2743301..0045b4dd59 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -244,6 +244,7 @@ module.exports = React.createClass({
             const complexity = this.state.passwordComplexity;
             const score = complexity ? complexity.score : 0;
             return <progress
+                className="mx_AuthBody_passwordScore"
                 max={PASSWORD_MIN_SCORE}
                 value={score}
             />;