diff --git a/src/app/accounts/set-password.component.html b/src/app/accounts/set-password.component.html
index 27cc4283..35835493 100644
--- a/src/app/accounts/set-password.component.html
+++ b/src/app/accounts/set-password.component.html
@@ -7,7 +7,7 @@
                     <div class="card-body">
                         <app-callout type="info">{{'ssoCompleteRegistration' | i18n}}</app-callout>
                         <div class="form-group">
-                            <app-callout type="info" *ngIf="!enforcedPolicyOptions">
+                            <app-callout type="info" *ngIf="enforcedPolicyOptions">
                                 {{'masterPasswordPolicyInEffect' | i18n}}
                                 <ul class="mb-0">
                                     <li *ngIf="enforcedPolicyOptions?.minComplexity > 0">
@@ -16,17 +16,22 @@
                                     <li *ngIf="enforcedPolicyOptions?.minLength > 0">
                                         {{'policyInEffectMinLength' | i18n : enforcedPolicyOptions?.minLength.toString()}}
                                     </li>
-                                    <li *ngIf="!enforcedPolicyOptions?.requireUpper">
+                                    <li *ngIf="enforcedPolicyOptions?.requireUpper">
                                         {{'policyInEffectUppercase' | i18n}}</li>
-                                    <li *ngIf="!enforcedPolicyOptions?.requireLower">
+                                    <li *ngIf="enforcedPolicyOptions?.requireLower">
                                         {{'policyInEffectLowercase' | i18n}}</li>
-                                    <li *ngIf="!enforcedPolicyOptions?.requireNumbers">
+                                    <li *ngIf="enforcedPolicyOptions?.requireNumbers">
                                         {{'policyInEffectNumbers' | i18n}}</li>
-                                    <li *ngIf="!enforcedPolicyOptions?.requireSpecial">
+                                    <li *ngIf="enforcedPolicyOptions?.requireSpecial">
                                         {{'policyInEffectSpecial' | i18n : '!@#$%^&*'}}</li>
                                 </ul>
                             </app-callout>
-                            <label for="masterPassword">{{'masterPass' | i18n}}</label>
+                            <label for="masterPassword">{{'masterPass' | i18n}}
+                                <strong class="form-text d-inline-block ml-2 text-{{masterPasswordScoreColor}}"
+                                    *ngIf="masterPasswordScoreText">
+                                    {{masterPasswordScoreText}}
+                                </strong>
+                            </label>
                             <div class="d-flex">
                                 <div class="w-100">
                                     <input id="masterPassword" type="{{showPassword ? 'text' : 'password'}}"
@@ -74,8 +79,9 @@
                         <div class="d-flex">
                             <button type="submit" class="btn btn-primary btn-block btn-submit"
                                 [disabled]="form.loading">
-                                <i class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}" aria-hidden="true"></i>
-                                <span>{{'submit' | i18n}}</span>
+                                <i [hidden]="!form.loading" class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"
+                                    aria-hidden="true"></i>
+                                <span [hidden]="form.loading">{{'submit' | i18n}}</span>
                             </button>
                             <button type="button" class="btn btn-outline-secondary btn-block ml-2 mt-0"
                                 (click)="logOut()">
diff --git a/src/app/accounts/set-password.component.ts b/src/app/accounts/set-password.component.ts
index a36e7d04..7d8c49a4 100644
--- a/src/app/accounts/set-password.component.ts
+++ b/src/app/accounts/set-password.component.ts
@@ -26,6 +26,7 @@ export class SetPasswordComponent extends BaseSetPasswordComponent {
         platformUtilsService: PlatformUtilsService, policyService: PolicyService, router: Router) {
         super(i18nService, cryptoService, messagingService, userService, passwordGenerationService,
             platformUtilsService, policyService, router, apiService);
+        super.successRoute = '/tabs/dashboard';
     }
 
     get masterPasswordScoreWidth() {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 584110f0..70e48c17 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -680,5 +680,41 @@
     },
     "masterPassHintDesc": {
         "message": "A master password hint can help you remember your password if you forget it."
+    },
+    "strong": {
+        "message": "Strong",
+        "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
+    },
+    "good": {
+        "message": "Good",
+        "description": "ex. A good password. Scale: Weak -> Good -> Strong"
+    },
+    "weak": {
+        "message": "Weak",
+        "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
+    },
+    "weakMasterPassword": {
+        "message": "Weak Master Password"
+    },
+    "weakMasterPasswordDesc": {
+        "message": "The master password you have chosen is weak. You should use a strong master password (or a passphrase) to properly protect your Bitwarden account. Are you sure you want to use this master password?"
+    },
+    "errorOccurred": {
+        "message": "An error has occurred."
+    },
+    "error": {
+        "message": "Error"
+    },
+    "masterPassLength": {
+        "message": "Master password must be at least 8 characters long."
+    },
+    "masterPassDoesntMatch": {
+        "message": "Master password confirmation does not match."
+    },
+    "masterPasswordPolicyRequirementsNotMet": {
+        "message": "Your new master password does not meet the policy requirements."
+    },
+    "loading": {
+        "message": "Loading"
     }
 }