diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index a70c28abe..161edaf13 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -28,7 +28,7 @@
       "passwordPlaceholder": "e.g. •••••••••••",
       "resetPassword": "Reset your password",
       "resetPasswordAction": "Send me a password reset link",
-      "restPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.",
+      "resetPasswordSuccess": "Check your inbox! You should have an e-mail with instructions on how to reset your password.",
       "passwordsDontMatch": "Passwords don't match",
       "confirmEmailSuccess": "You successfully confirmed your email! You can log in now.",
       "totpTitle": "Two Factor Authentication Code",
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 6bf6f6bb3..547041ec9 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -184,7 +184,14 @@ export default {
 			}
 
 			this.$store.dispatch('auth/login', credentials)
+				.then(() => {
+					this.$store.commit('auth/needsTotpPasscode', false)
+				})
 				.catch(e => {
+					if (e.response && e.response.data.code === 1017 && !credentials.totpPasscode) {
+						return
+					}
+
 					const err = getErrorText(e, p => this.$t(p))
 					if (typeof err[1] !== 'undefined') {
 						this.$store.commit(ERROR_MESSAGE, err[1])
diff --git a/src/views/user/PasswordReset.vue b/src/views/user/PasswordReset.vue
index 12e4497dd..7a697bf55 100644
--- a/src/views/user/PasswordReset.vue
+++ b/src/views/user/PasswordReset.vue
@@ -39,7 +39,7 @@
 							:loading="this.passwordResetService.loading"
 							@click="submit"
 						>
-							{{ $t('user.auth.resetPassoword') }}
+							{{ $t('user.auth.resetPassword') }}
 						</x-button>
 					</div>
 				</div>