diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index e2c02b26b13..6c9c222d99a 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -4,11 +4,11 @@
             <a routerLink="/home">{{'cancel' | i18n}}</a>
         </div>
         <div class="center">
-            <span class="title">{{'setMasterPassword' | i18n}}</span>
+            <span class="title">{{'appName' | i18n}}</span>
         </div>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
-                <span [hidden]="form.loading">{{'submit' | i18n}}</span>
+                <span [hidden]="form.loading">{{'login' | i18n}}</span>
                 <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>
diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html
index f47d3d8884b..91fd86250bd 100644
--- a/src/popup/accounts/set-password.component.html
+++ b/src/popup/accounts/set-password.component.html
@@ -4,11 +4,11 @@
             <a routerLink="/home">{{'cancel' | i18n}}</a>
         </div>
         <div class="center">
-            <span class="title">{{'appName' | i18n}}</span>
+            <span class="title">{{'setMasterPassword' | i18n}}</span>
         </div>
         <div class="right">
             <button type="submit" appBlurClick [disabled]="form.loading">
-                <span [hidden]="form.loading">{{'login' | i18n}}</span>
+                <span [hidden]="form.loading">{{'submit' | i18n}}</span>
                 <i class="fa fa-spinner fa-lg fa-spin" [hidden]="!form.loading" aria-hidden="true"></i>
             </button>
         </div>