diff --git a/src/app/views/auth/password/reset.html b/src/app/views/auth/password/reset.html
index 47adedd5..460c89be 100644
--- a/src/app/views/auth/password/reset.html
+++ b/src/app/views/auth/password/reset.html
@@ -10,23 +10,26 @@ <h2>{{ 'mno_enterprise.auth.passwords.edit.title' | translate }}</h2>
           <form class="form-horizontal autofill-detect" id="new_user" name="vm.form" ng-submit="vm.password_reset()" validate>
             <div class='row'>
               <div class='col-sm-12'>
+                <div class="input-group">
                 <input mno-password-strength password-score="vm.user.$pwdScore" type="{{isShown ? 'text' : 'password'}}" placeholder="*Password" ng-model="vm.user.password" class="form-control" name="password" id="user_password" autocomplete="off"  autofocus required/>
-                <span class="input-group-addon pw-strength-indicator" ng-class='vm.user.$pwdScore.class' style="display: inline;">
+                <span class="input-group-addon pw-strength-indicator" ng-class='vm.user.$pwdScore.class'>
                   {{ vm.user.$pwdScore.value }}
                 </span>
               </div>
+              </div>
             </div>
             <br>
             <div class='row'>
               <div class='col-sm-12'>
                 <input type="{{isShown ? 'text' : 'password'}}" placeholder="*Confirm Password" ng-model="vm.user.password_confirmation" class="form-control" name="password_confirmation" id="user_password_confirmation" ng-change="vm.resetConfirmed = false" autocomplete="off" autofocus required />
               </div>
-              <div class="col-md-3 text-center" style="padding: 0px 2px;">
+            </div>
+            <br>
+              <div class="text-center" >
                 <label>Show</label>
                 <br />
                 <input type="checkbox" ng-model="isShown" />
               </div>
-            </div>
             <br>
             <div class='row'>
               <div class='col-sm-12'>
@@ -36,9 +39,6 @@ <h2>{{ 'mno_enterprise.auth.passwords.edit.title' | translate }}</h2>
                 </div>
               </div>
             </div>
-
-
-
             <hr>
             <a ui-sref="login">Log in</a><br />
 
diff --git a/src/app/views/auth/password/reset.less b/src/app/views/auth/password/reset.less
new file mode 100644
index 00000000..53694ce1
--- /dev/null
+++ b/src/app/views/auth/password/reset.less
@@ -0,0 +1,16 @@
+input-group-addon.pw-strength-indicator {
+  color: transparent;
+
+  &.danger {
+    color: @brand-danger;
+  }
+
+  &.warning,
+  &.success {
+    color: @brand-success;
+  }
+}
+
+.input-group-addon.pw-strength-indicator.classic {
+  .border-right-radius(4px);
+}