diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index da4cabf61..585cdfb06 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -56,7 +56,8 @@
       "showPassword": "Show the password",
       "hidePassword": "Hide the password",
       "noAccountYet": "Don't have an account yet?",
-      "alreadyHaveAnAccount": "Already have an account?"
+      "alreadyHaveAnAccount": "Already have an account?",
+      "remember": "Stay logged in"
     },
     "settings": {
       "title": "Settings",
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index e71bbe738..9e2f9cbb8 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -1,5 +1,6 @@
 import {HTTPFactory} from '@/http-common'
 import {i18n, getCurrentLanguage, saveLanguage} from '@/i18n'
+import {objectToSnakeCase} from '@/helpers/case'
 import {LOADING} from '../mutation-types'
 import UserModel from '@/models/user'
 import UserSettingsService from '@/services/userSettings'
@@ -90,17 +91,8 @@ export default {
 			// Delete an eventually preexisting old token
 			removeToken()
 
-			const data = {
-				username: credentials.username,
-				password: credentials.password,
-			}
-
-			if (credentials.totpPasscode) {
-				data.totp_passcode = credentials.totpPasscode
-			}
-
 			try {
-				const response = await HTTP.post('login', data)
+				const response = await HTTP.post('login', objectToSnakeCase(credentials))
 				// Save the token to local storage for later use
 				saveToken(response.data.token, true)
 
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index b6e5be039..c00110476 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -58,6 +58,12 @@
 					/>
 				</div>
 			</div>
+			<div class="field">
+				<label class="label">
+					<input type="checkbox" v-model="rememberMe" class="mr-1"/>
+					{{ $t('user.auth.remember') }}
+				</label>
+			</div>
 
 			<x-button
 				@click="submit"
@@ -118,6 +124,7 @@ export default {
 			usernameValid: true,
 			password: '',
 			validatePasswordInitially: false,
+			rememberMe: false,
 		}
 	},
 	beforeMount() {
@@ -197,6 +204,7 @@ export default {
 			const credentials = {
 				username: this.$refs.username.value,
 				password: this.password,
+				longToken: this.rememberMe,
 			}
 
 			if (credentials.username === '' || credentials.password === '') {