diff --git a/src/App.vue b/src/App.vue
index c8367591f8..0704479fac 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -29,6 +29,9 @@
 							<transition name="fade">
 								<div class="dropdown-menu" v-if="userMenuActive">
 									<div class="dropdown-content">
+										<router-link :to="{name: 'userSettings'}" class="dropdown-item">
+											Settings
+										</router-link>
 										<a @click="logout()" class="dropdown-item">
 											Logout
 										</a>
diff --git a/src/components/user/Settings.vue b/src/components/user/Settings.vue
new file mode 100644
index 0000000000..d7c6d8349e
--- /dev/null
+++ b/src/components/user/Settings.vue
@@ -0,0 +1,128 @@
+<template>
+	<div class="loader-container" v-bind:class="{ 'is-loading': passwordUpdateService.loading}">
+		<div class="card">
+			<header class="card-header">
+				<p class="card-header-title">
+					Update Your Password
+				</p>
+			</header>
+			<div class="card-content">
+				<div class="content">
+					<form @submit.prevent="updatePassword()">
+						<div class="field">
+							<label class="label" for="newPassword">New Password</label>
+							<div class="control">
+								<input class="input" type="password" id="newPassword" placeholder="The new password..."
+									v-model="passwordUpdate.newPassword" @keyup.enter="updatePassword"/>
+							</div>
+						</div>
+						<div class="field">
+							<label class="label" for="newPasswordConfirm">New Password Confirmation</label>
+							<div class="control">
+								<input class="input" type="password" id="newPasswordConfirm" placeholder="Confirm your new password..."
+									v-model="passwordConfirm" @keyup.enter="updatePassword"/>
+							</div>
+						</div>
+						<div class="field">
+							<label class="label" for="currentPassword">Current Password</label>
+							<div class="control">
+								<input class="input" type="password" id="currentPassword" placeholder="Your current password"
+									v-model="passwordUpdate.oldPassword" @keyup.enter="updatePassword"/>
+							</div>
+						</div>
+					</form>
+
+					<div class="bigbuttons">
+						<button @click="updatePassword()" class="button is-primary is-fullwidth"
+								:class="{ 'is-loading': passwordUpdateService.loading}">
+							Save
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="card">
+			<header class="card-header">
+				<p class="card-header-title">
+					Update Your E-Mail Address
+				</p>
+			</header>
+			<div class="card-content">
+				<div class="content">
+					<form @submit.prevent="updateEmail()">
+						<div class="field">
+							<label class="label" for="newEmail">New Email Address</label>
+							<div class="control">
+								<input class="input" type="email" id="newEmail" placeholder="The new email address..."
+									v-model="emailUpdate.newEmail" @keyup.enter="updateEmail"/>
+							</div>
+						</div>
+						<div class="field">
+							<label class="label" for="currentPassword">Current Password</label>
+							<div class="control">
+								<input class="input" type="password" id="currentPassword" placeholder="Your current password"
+									v-model="emailUpdate.password" @keyup.enter="updateEmail"/>
+							</div>
+						</div>
+					</form>
+
+					<div class="bigbuttons">
+						<button @click="updateEmail()" class="button is-primary is-fullwidth"
+								:class="{ 'is-loading': emailUpdateService.loading}">
+							Save
+						</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	import PasswordUpdateModel from '../../models/passwordUpdate'
+	import PasswordUpdateService from '../../services/passwordUpdateService'
+	import EmailUpdateService from '../../services/emailUpdate'
+	import EmailUpdateModel from '../../models/emailUpdate'
+
+	export default {
+		name: 'Settings',
+		data() {
+			return {
+				passwordUpdateService: PasswordUpdateService,
+				passwordUpdate: PasswordUpdateModel,
+				passwordConfirm: '',
+
+				emailUpdateService: EmailUpdateService,
+				emailUpdate: EmailUpdateModel,
+			}
+		},
+		created() {
+			this.passwordUpdate = new PasswordUpdateModel()
+			this.passwordUpdateService = new PasswordUpdateService()
+
+			this.emailUpdate = new EmailUpdateModel()
+			this.emailUpdateService = new EmailUpdateService()
+		},
+		methods: {
+			updatePassword() {
+				if (this.passwordConfirm !== this.passwordUpdate.newPassword) {
+					this.error({message: 'The new password and its confirmation don\'t match.'}, this)
+					return
+				}
+
+				this.passwordUpdateService.update(this.passwordUpdate)
+					.then(() => {
+						this.success({message: 'The password was successfully updated.'}, this)
+					})
+					.catch(e => this.error(e, this))
+			},
+			updateEmail() {
+				this.emailUpdateService.update(this.emailUpdate)
+					.then(() => {
+						this.success({message: 'Your email address was successfully updated. We\'ve sent you a link to confirm it.'}, this)
+					})
+					.catch(e => this.error(e, this))
+			},
+		},
+	}
+</script>
diff --git a/src/models/emailUpdate.js b/src/models/emailUpdate.js
new file mode 100644
index 0000000000..42fe91e357
--- /dev/null
+++ b/src/models/emailUpdate.js
@@ -0,0 +1,10 @@
+import AbstractModel from './abstractModel'
+
+export default class EmailUpdateModel extends AbstractModel {
+	defaults() {
+		return {
+			newEmail: '',
+			passwort: '',
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/models/passwordUpdate.js b/src/models/passwordUpdate.js
new file mode 100644
index 0000000000..c98692976c
--- /dev/null
+++ b/src/models/passwordUpdate.js
@@ -0,0 +1,10 @@
+import AbstractModel from './abstractModel'
+
+export default class PasswordUpdateModel extends AbstractModel {
+	defaults() {
+		return {
+			newPassword: '',
+			oldPassword: '',
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 5cb4bceecb..c7da9f6763 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,6 +8,7 @@ import LoginComponent from '@/components/user/Login'
 import RegisterComponent from '@/components/user/Register'
 import PasswordResetComponent from '@/components/user/PasswordReset'
 import GetPasswordResetComponent from '@/components/user/RequestPasswordReset'
+import UserSettingsComponent from '@/components/user/Settings'
 // List Handling
 import ShowListComponent from '@/components/lists/ShowList'
 import NewListComponent from '@/components/lists/NewList'
@@ -154,5 +155,10 @@ export default new Router({
 			name: 'migrateWunderlist',
 			component: WunderlistMigrationComponent,
 		},
+		{
+			path: '/user/settings',
+			name: 'userSettings',
+			component: UserSettingsComponent,
+		},
 	]
 })
\ No newline at end of file
diff --git a/src/services/emailUpdate.js b/src/services/emailUpdate.js
new file mode 100644
index 0000000000..3156ab0d1b
--- /dev/null
+++ b/src/services/emailUpdate.js
@@ -0,0 +1,9 @@
+import AbstractService from './abstractService'
+
+export default class EmailUpdateService extends AbstractService {
+	constructor() {
+		super({
+			update: '/user/settings/email',
+		})
+	}
+}
\ No newline at end of file
diff --git a/src/services/passwordUpdateService.js b/src/services/passwordUpdateService.js
new file mode 100644
index 0000000000..5f1f988908
--- /dev/null
+++ b/src/services/passwordUpdateService.js
@@ -0,0 +1,9 @@
+import AbstractService from './abstractService'
+
+export default class PasswordUpdateService extends AbstractService {
+	constructor() {
+		super({
+			update: '/user/password'
+		})
+	}
+}
\ No newline at end of file