diff --git a/database/build/.env.dist b/database/build/.env.dist
new file mode 100644
index 000000000..505546e1b
--- /dev/null
+++ b/database/build/.env.dist
@@ -0,0 +1,2 @@
+// For production you need to put your env file in here.
+// Please copy the dist file from the root folder in here and rename it to .env
\ No newline at end of file
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 851f2a376..5db1c0a82 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -105,7 +105,8 @@
   "language": "Sprache",
   "languages": {
     "de": "Deutsch",
-    "en": "English"
+    "en": "English",
+    "success": "Deine Sprache wurde erfolgreich geändert."
   },
   "login": "Anmeldung",
   "logout": "Abmelden",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 4edf8e72d..9ca544440 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -105,7 +105,8 @@
   "language": "Language",
   "languages": {
     "de": "Deutsch",
-    "en": "English"
+    "en": "English",
+    "success": "Your language has been successfully updated."
   },
   "login": "Login",
   "logout": "Logout",
diff --git a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
index 055441aec..d7a059715 100644
--- a/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
+++ b/frontend/src/views/Pages/UserProfile/UserCard_Language.vue
@@ -62,6 +62,7 @@
   </b-card>
 </template>
 <script>
+import { localeChanged } from 'vee-validate'
 import LanguageSwitchSelect from '../../../components/LanguageSwitchSelect.vue'
 import { updateUserInfos } from '../../../graphql/queries'
 
@@ -98,8 +99,11 @@ export default {
           },
         })
         .then(() => {
-          this.$store.commit('language', this.language)
+          this.$i18n.locale = this.language
+          this.$store.commit('language', this.$i18n.locale)
+          localeChanged(this.$i18n.locale)
           this.cancelEdit()
+          this.$toasted.success(this.$t('languages.success'))
         })
         .catch((error) => {
           this.$toasted.error(error.message)