diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index e969fe46f..d7548706c 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -7,12 +7,18 @@
 <script>
 import LoginForm from '~/components/LoginForm/LoginForm.vue'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
+import { mapGetters } from 'vuex'
 
 export default {
   layout: 'no-header',
   components: {
     LoginForm,
   },
+  computed: {
+    ...mapGetters({
+      user: 'auth/user',
+    }),
+  },
   asyncData({ store, redirect }) {
     if (store.getters['auth/user'].termsAndConditionsAgreedVersion === VERSION) {
       redirect('/')
@@ -20,6 +26,7 @@ export default {
   },
   methods: {
     handleSuccess() {
+      this.$i18n.set(this.user.locale || 'en')
       this.$router.replace(this.$route.query.path || '/')
     },
   },
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 90c59a8f5..35046446b 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -84,6 +84,7 @@ export const actions = {
             role
             about
             locationName
+            locale
             contributionsCount
             commentedCount
             allowEmbedIframes
diff --git a/webapp/store/auth.test.js b/webapp/store/auth.test.js
index e45fec693..ad398520f 100644
--- a/webapp/store/auth.test.js
+++ b/webapp/store/auth.test.js
@@ -13,6 +13,7 @@ const currentUser = {
   email: 'user@example.org',
   avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
   role: 'user',
+  locale: 'de',
 }
 const successfulLoginResponse = { data: { login: token } }
 const successfulCurrentUserResponse = { data: { currentUser } }
@@ -126,6 +127,7 @@ describe('actions', () => {
                 email: 'user@example.org',
                 avatar: 'https://s3.amazonaws.com/uifaces/faces/twitter/mutu_krish/128.jpg',
                 role: 'user',
+                locale: 'de',
               },
             ],
           ]),