diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html
index 9f291a527b..f47d3d8884 100644
--- a/src/popup/accounts/set-password.component.html
+++ b/src/popup/accounts/set-password.component.html
@@ -102,23 +102,4 @@
             </div>
         </div>
     </content>
-</form>
-
-
-<!-- <div class="content">
-    <img class="logo-image" alt="Bitwarden">
-    <p class="lead">{{'setMasterPassword' | i18n}}</p>
-    
-    <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate autocomplete="off">
-        
-        <div class="buttons">
-            <button type="submit" class="btn primary block" [disabled]="form.loading">
-                <i *ngIf="form.loading" class="fa fa-spinner fa-spin" title="{{'loading' | i18n}}"
-                    aria-hidden="true"></i>
-                <span>{{'submit' | i18n}}</span>
-            </button>
-            <button class="btn block" (click)="logOut()">
-                <span>{{'logOut' | i18n}}</span>
-            </button>
-        </div>
-    </form> -->
\ No newline at end of file
+</form>
\ No newline at end of file
diff --git a/src/popup/app-routing.module.ts b/src/popup/app-routing.module.ts
index 959263d77f..5c3ea8dbba 100644
--- a/src/popup/app-routing.module.ts
+++ b/src/popup/app-routing.module.ts
@@ -16,6 +16,7 @@ import { HomeComponent } from './accounts/home.component';
 import { LockComponent } from './accounts/lock.component';
 import { LoginComponent } from './accounts/login.component';
 import { RegisterComponent } from './accounts/register.component';
+import { SetPasswordComponent } from './accounts/set-password.component';
 import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
 import { TwoFactorComponent } from './accounts/two-factor.component';
 import { SsoComponent } from './accounts/sso.component';
@@ -39,7 +40,6 @@ import { GroupingsComponent } from './vault/groupings.component';
 import { PasswordHistoryComponent } from './vault/password-history.component';
 import { ShareComponent } from './vault/share.component';
 import { ViewComponent } from './vault/view.component';
-import { SetPasswordComponent } from './accounts/set-password.component';
 
 const routes: Routes = [
     {
diff --git a/src/popup/app.module.ts b/src/popup/app.module.ts
index f6ec79ae06..e3f7b54c01 100644
--- a/src/popup/app.module.ts
+++ b/src/popup/app.module.ts
@@ -21,6 +21,7 @@ import { HomeComponent } from './accounts/home.component';
 import { LockComponent } from './accounts/lock.component';
 import { LoginComponent } from './accounts/login.component';
 import { RegisterComponent } from './accounts/register.component';
+import { SetPasswordComponent } from './accounts/set-password.component';
 import { TwoFactorOptionsComponent } from './accounts/two-factor-options.component';
 import { TwoFactorComponent } from './accounts/two-factor.component';
 import { SsoComponent } from './accounts/sso.component';
@@ -45,7 +46,6 @@ import { GroupingsComponent } from './vault/groupings.component';
 import { PasswordHistoryComponent } from './vault/password-history.component';
 import { ShareComponent } from './vault/share.component';
 import { ViewComponent } from './vault/view.component';
-import { SetPasswordComponent } from './accounts/set-password.component';
 
 import { A11yTitleDirective } from 'jslib/angular/directives/a11y-title.directive';
 import { ApiActionDirective } from 'jslib/angular/directives/api-action.directive';