diff --git a/frontend/src/components/UserCard_CoinAnimation.spec.js b/frontend/src/components/UserSettings/UserCoinAnimation.spec.js
similarity index 96%
rename from frontend/src/components/UserCard_CoinAnimation.spec.js
rename to frontend/src/components/UserSettings/UserCoinAnimation.spec.js
index 92c2f2b54..aabf927fb 100644
--- a/frontend/src/components/UserCard_CoinAnimation.spec.js
+++ b/frontend/src/components/UserSettings/UserCoinAnimation.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardCoinAnimation from './UserCard_CoinAnimation'
+import UserCoinAnimation from './UserCoinAnimation'
 import { updateUserInfos } from '@/graphql/mutations'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -28,7 +28,7 @@ describe('UserCard_CoinAnimation', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardCoinAnimation, { localVue, mocks })
+    return mount(UserCoinAnimation, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_CoinAnimation.vue b/frontend/src/components/UserSettings/UserCoinAnimation.vue
similarity index 98%
rename from frontend/src/components/UserCard_CoinAnimation.vue
rename to frontend/src/components/UserSettings/UserCoinAnimation.vue
index 19a082e41..e73ddb7af 100644
--- a/frontend/src/components/UserCard_CoinAnimation.vue
+++ b/frontend/src/components/UserSettings/UserCoinAnimation.vue
@@ -33,7 +33,7 @@
 <script>
 import { updateUserInfos } from '@/graphql/mutations'
 export default {
-  name: 'FormUserCoinAnimation',
+  name: 'UserCoinAnimation',
   data() {
     return {
       CoinAnimationStatus: this.$store.state.coinanimation,
diff --git a/frontend/src/components/UserCard_FormUserData.spec.js b/frontend/src/components/UserSettings/UserData.spec.js
similarity index 97%
rename from frontend/src/components/UserCard_FormUserData.spec.js
rename to frontend/src/components/UserSettings/UserData.spec.js
index 956318367..471360582 100644
--- a/frontend/src/components/UserCard_FormUserData.spec.js
+++ b/frontend/src/components/UserSettings/UserData.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardFormUserData from './UserCard_FormUserData'
+import UserData from './UserData'
 import flushPromises from 'flush-promises'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -28,7 +28,7 @@ describe('UserCard_FormUserData', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardFormUserData, { localVue, mocks })
+    return mount(UserData, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_FormUserData.vue b/frontend/src/components/UserSettings/UserData.vue
similarity index 99%
rename from frontend/src/components/UserCard_FormUserData.vue
rename to frontend/src/components/UserSettings/UserData.vue
index 56b8e171c..b7c3e8777 100644
--- a/frontend/src/components/UserCard_FormUserData.vue
+++ b/frontend/src/components/UserSettings/UserData.vue
@@ -67,7 +67,7 @@
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserData',
+  name: 'UserData',
   data() {
     return {
       showUserData: true,
diff --git a/frontend/src/components/UserCard_Language.spec.js b/frontend/src/components/UserSettings/UserLanguage.spec.js
similarity index 97%
rename from frontend/src/components/UserCard_Language.spec.js
rename to frontend/src/components/UserSettings/UserLanguage.spec.js
index 5f54d2905..f3882487b 100644
--- a/frontend/src/components/UserCard_Language.spec.js
+++ b/frontend/src/components/UserSettings/UserLanguage.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardLanguage from './UserCard_Language'
+import UserLanguage from './UserLanguage'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 
@@ -35,7 +35,7 @@ describe('UserCard_Language', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardLanguage, { localVue, mocks })
+    return mount(UserLanguage, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_Language.vue b/frontend/src/components/UserSettings/UserLanguage.vue
similarity index 99%
rename from frontend/src/components/UserCard_Language.vue
rename to frontend/src/components/UserSettings/UserLanguage.vue
index c792354de..16582cdb8 100644
--- a/frontend/src/components/UserCard_Language.vue
+++ b/frontend/src/components/UserSettings/UserLanguage.vue
@@ -64,7 +64,7 @@ import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserLanguage',
+  name: 'UserLanguage',
   components: { LanguageSwitchSelect },
   data() {
     return {
diff --git a/frontend/src/components/UserCard_Newsletter.spec.js b/frontend/src/components/UserSettings/UserNewsletter.spec.js
similarity index 96%
rename from frontend/src/components/UserCard_Newsletter.spec.js
rename to frontend/src/components/UserSettings/UserNewsletter.spec.js
index 8cb55e8c4..bb2781586 100644
--- a/frontend/src/components/UserCard_Newsletter.spec.js
+++ b/frontend/src/components/UserSettings/UserNewsletter.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardNewsletter from './UserCard_Newsletter'
+import UserNewsletter from './UserNewsletter'
 import { unsubscribeNewsletter, subscribeNewsletter } from '@/graphql/mutations'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -29,7 +29,7 @@ describe('UserCard_Newsletter', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardNewsletter, { localVue, mocks })
+    return mount(UserNewsletter, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_Newsletter.vue b/frontend/src/components/UserSettings/UserNewsletter.vue
similarity index 98%
rename from frontend/src/components/UserCard_Newsletter.vue
rename to frontend/src/components/UserSettings/UserNewsletter.vue
index b378406cf..39f3a14af 100644
--- a/frontend/src/components/UserCard_Newsletter.vue
+++ b/frontend/src/components/UserSettings/UserNewsletter.vue
@@ -30,7 +30,7 @@
 import { subscribeNewsletter, unsubscribeNewsletter } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserNewsletter',
+  name: 'UserNewsletter',
   data() {
     return {
       newsletterState: this.$store.state.newsletterState,
diff --git a/frontend/src/components/UserCard_FormUserPasswort.spec.js b/frontend/src/components/UserSettings/UserPassword.spec.js
similarity index 98%
rename from frontend/src/components/UserCard_FormUserPasswort.spec.js
rename to frontend/src/components/UserSettings/UserPassword.spec.js
index fb79c42c8..59ec65bd7 100644
--- a/frontend/src/components/UserCard_FormUserPasswort.spec.js
+++ b/frontend/src/components/UserSettings/UserPassword.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import UserCardFormPasswort from './UserCard_FormUserPasswort'
+import UserPassword from './UserPassword'
 import flushPromises from 'flush-promises'
 
 import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
@@ -20,7 +20,7 @@ describe('UserCard_FormUserPasswort', () => {
   }
 
   const Wrapper = () => {
-    return mount(UserCardFormPasswort, { localVue, mocks })
+    return mount(UserPassword, { localVue, mocks })
   }
 
   describe('mount', () => {
diff --git a/frontend/src/components/UserCard_FormUserPasswort.vue b/frontend/src/components/UserSettings/UserPassword.vue
similarity index 99%
rename from frontend/src/components/UserCard_FormUserPasswort.vue
rename to frontend/src/components/UserSettings/UserPassword.vue
index 690edb83e..430f9a75d 100644
--- a/frontend/src/components/UserCard_FormUserPasswort.vue
+++ b/frontend/src/components/UserSettings/UserPassword.vue
@@ -53,7 +53,7 @@ import InputPasswordConfirmation from '@/components/Inputs/InputPasswordConfirma
 import { updateUserInfos } from '@/graphql/mutations'
 
 export default {
-  name: 'FormUserPasswort',
+  name: 'UserPassword',
   components: {
     InputPassword,
     InputPasswordConfirmation,
diff --git a/frontend/src/pages/Profile.spec.js b/frontend/src/pages/Profile.spec.js
index 5df365cac..fb4ee2d42 100644
--- a/frontend/src/pages/Profile.spec.js
+++ b/frontend/src/pages/Profile.spec.js
@@ -24,15 +24,23 @@ describe('Profile', () => {
     })
 
     it('has a user first and last name form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserData' }).exists()).toBeTruthy()
-    })
-
-    it('has a user change password form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserPasswort' }).exists()).toBeTruthy()
+      expect(wrapper.findComponent({ name: 'UserData' }).exists()).toBeTruthy()
     })
 
     it('has a user change language form', () => {
-      expect(wrapper.findComponent({ name: 'FormUserLanguage' }).exists()).toBeTruthy()
+      expect(wrapper.findComponent({ name: 'UserLanguage' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change password form', () => {
+      expect(wrapper.findComponent({ name: 'UserPassword' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change newsletter form', () => {
+      expect(wrapper.findComponent({ name: 'UserNewsletter' }).exists()).toBeTruthy()
+    })
+
+    it('has a user change coin animation form', () => {
+      expect(wrapper.findComponent({ name: 'UserCoinAnimation' }).exists()).toBeTruthy()
     })
   })
 })
diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue
index e36b7b297..01308b29a 100644
--- a/frontend/src/pages/Profile.vue
+++ b/frontend/src/pages/Profile.vue
@@ -1,34 +1,34 @@
 <template>
   <div fluid="sm" class="mr-2">
     <user-card :balance="balance" :transactionCount="transactionCount"></user-card>
-    <form-user-data />
+    <user-data />
     <hr />
-    <form-user-passwort />
+    <user-password />
     <hr />
-    <form-user-language />
+    <user-language />
     <hr />
-    <form-user-newsletter />
+    <user-newsletter />
     <hr />
-    <form-user-coin-animation />
+    <user-coin-animation />
   </div>
 </template>
 <script>
 import UserCard from '@/components/UserCard.vue'
-import FormUserData from '@/components/UserCard_FormUserData.vue'
-import FormUserPasswort from '@/components/UserCard_FormUserPasswort.vue'
-import FormUserLanguage from '@/components/UserCard_Language.vue'
-import FormUserNewsletter from '@/components/UserCard_Newsletter.vue'
-import FormUserCoinAnimation from '@/components/UserCard_CoinAnimation.vue'
+import UserData from '@/components/UserSettings/UserData.vue'
+import UserPassword from '@/components/UserSettings/UserPassword.vue'
+import UserLanguage from '@/components/UserSettings/UserLanguage.vue'
+import UserNewsletter from '@/components/UserSettings/UserNewsletter.vue'
+import UserCoinAnimation from '@/components/UserSettings/UserCoinAnimation.vue'
 
 export default {
   name: 'Profile',
   components: {
     UserCard,
-    FormUserData,
-    FormUserPasswort,
-    FormUserLanguage,
-    FormUserNewsletter,
-    FormUserCoinAnimation,
+    UserData,
+    UserPassword,
+    UserLanguage,
+    UserNewsletter,
+    UserCoinAnimation,
   },
   props: {
     balance: { type: Number, default: 0 },
diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js
index 0909ff531..3fc8dc766 100755
--- a/frontend/src/routes/routes.js
+++ b/frontend/src/routes/routes.js
@@ -50,7 +50,7 @@ const routes = [
     path: '/thx/:comingFrom',
     component: () => import('@/pages/thx.vue'),
     beforeEnter: (to, from, next) => {
-      const validFrom = ['forgot-password', 'reset', 'register', 'login', 'checkEmail']
+      const validFrom = ['forgot-password', 'reset-password', 'register', 'login', 'checkEmail']
       if (!validFrom.includes(from.path.split('/')[1])) {
         next({ path: '/login' })
       } else {