diff --git a/frontend/src/components/LanguageSwitch2.vue b/frontend/src/components/LanguageSwitch2.vue
new file mode 100644
index 000000000..c94c9c6e0
--- /dev/null
+++ b/frontend/src/components/LanguageSwitch2.vue
@@ -0,0 +1,73 @@
+<template>
+  <div class="language-switch">
+    <span
+      v-for="lang in locales"
+      @click.prevent="saveLocale(lang.code)"
+      :key="lang.code"
+      class="pointer pr-3"
+      :class="$store.state.language === lang.code ? 'text-primary' : ''"
+    >
+      {{ lang.name }}
+    </span>
+  </div>
+</template>
+<script>
+import locales from '@/locales/'
+import { updateUserInfos } from '@/graphql/mutations'
+
+export default {
+  name: 'LanguageSwitch',
+  data() {
+    return {
+      locales: locales,
+      currentLanguage: {},
+    }
+  },
+  methods: {
+    setLocale(locale) {
+      this.$store.commit('language', locale)
+      this.currentLanguage = this.getLocaleObject(locale)
+    },
+    async saveLocale(locale) {
+      // if (this.$i18n.locale === locale) return
+      this.setLocale(locale)
+      if (this.$store.state.email) {
+        this.$apollo
+          .mutate({
+            mutation: updateUserInfos,
+            variables: {
+              locale: locale,
+            },
+          })
+          .then(() => {
+            // toast success message
+          })
+          .catch(() => {
+            // toast error message
+          })
+      }
+    },
+    getLocaleObject(code) {
+      return this.locales.find((l) => l.code === code)
+    },
+    getNavigatorLanguage() {
+      const lang = navigator.language
+      if (lang) return lang.split('-')[0]
+      return lang
+    },
+    setCurrentLanguage() {
+      let locale = this.$store.state.language || this.getNavigatorLanguage() || 'en'
+      let object = this.getLocaleObject(locale)
+      if (!object) {
+        locale = 'en'
+        object = this.getLocaleObject(locale)
+      }
+      this.setLocale(locale)
+      this.currentLanguage = object
+    },
+  },
+  created() {
+    this.setCurrentLanguage()
+  },
+}
+</script>