diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 9743cc28f5..e267ac9324 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -32,6 +32,8 @@ import { TwoFactorOptionsComponent } from './accounts/two-factor-options.compone
 import { TwoFactorComponent } from './accounts/two-factor.component';
 
 import { AccountComponent } from './settings/account.component';
+import { ChangeEmailComponent } from './settings/change-email.component';
+import { ChangePasswordComponent } from './settings/change-password.component';
 import { ProfileComponent } from './settings/profile.component';
 import { SettingsComponent } from './settings/settings.component';
 
@@ -96,6 +98,8 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
         BulkDeleteComponent,
         BulkMoveComponent,
         BulkShareComponent,
+        ChangeEmailComponent,
+        ChangePasswordComponent,
         CiphersComponent,
         CollectionsComponent,
         ExportComponent,
diff --git a/src/app/settings/account.component.html b/src/app/settings/account.component.html
index 2ea92bb1da..0fa0c54463 100644
--- a/src/app/settings/account.component.html
+++ b/src/app/settings/account.component.html
@@ -5,6 +5,8 @@
 <div class="secondary-header">
     <h1>Change Email</h1>
 </div>
+<app-change-email></app-change-email>
 <div class="secondary-header">
     <h1>Change Master Password</h1>
 </div>
+<app-change-password></app-change-password>
diff --git a/src/app/settings/change-email.component.html b/src/app/settings/change-email.component.html
new file mode 100644
index 0000000000..520f25600b
--- /dev/null
+++ b/src/app/settings/change-email.component.html
@@ -0,0 +1 @@
+change your email
diff --git a/src/app/settings/change-email.component.ts b/src/app/settings/change-email.component.ts
new file mode 100644
index 0000000000..2432dd6651
--- /dev/null
+++ b/src/app/settings/change-email.component.ts
@@ -0,0 +1,24 @@
+import {
+    Component,
+} from '@angular/core';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+@Component({
+    selector: 'app-change-email',
+    templateUrl: 'change-email.component.html',
+})
+export class ChangeEmailComponent {
+    formPromise: Promise<any>;
+
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private analytics: Angulartics2, private toasterService: ToasterService) { }
+
+    async submit() {
+
+    }
+}
diff --git a/src/app/settings/change-password.component.html b/src/app/settings/change-password.component.html
new file mode 100644
index 0000000000..6f9b9ed834
--- /dev/null
+++ b/src/app/settings/change-password.component.html
@@ -0,0 +1 @@
+change your password
diff --git a/src/app/settings/change-password.component.ts b/src/app/settings/change-password.component.ts
new file mode 100644
index 0000000000..ccaef71b8d
--- /dev/null
+++ b/src/app/settings/change-password.component.ts
@@ -0,0 +1,24 @@
+import {
+    Component,
+} from '@angular/core';
+
+import { ToasterService } from 'angular2-toaster';
+import { Angulartics2 } from 'angulartics2';
+
+import { ApiService } from 'jslib/abstractions/api.service';
+import { I18nService } from 'jslib/abstractions/i18n.service';
+
+@Component({
+    selector: 'app-change-password',
+    templateUrl: 'change-password.component.html',
+})
+export class ChangePasswordComponent {
+    formPromise: Promise<any>;
+
+    constructor(private apiService: ApiService, private i18nService: I18nService,
+        private analytics: Angulartics2, private toasterService: ToasterService) { }
+
+    async submit() {
+
+    }
+}