diff --git a/fittrackee_client/src/components/User/LoginOrRegisterForm.vue b/fittrackee_client/src/components/User/LoginOrRegisterForm.vue
index a0497984..bab4b401 100644
--- a/fittrackee_client/src/components/User/LoginOrRegisterForm.vue
+++ b/fittrackee_client/src/components/User/LoginOrRegisterForm.vue
@@ -34,7 +34,7 @@
               :placeholder="t('user.PASSWORD-CONFIRM')"
             />
           </div>
-          <button type="submit">{{ t('buttons.LOGIN') }}</button>
+          <button type="submit">{{ t(buttonText) }}</button>
         </form>
         <p v-if="errorMessage">
           {{ errorMessage }}
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-  import { computed, defineComponent, reactive } from 'vue'
+  import { ComputedRef, computed, defineComponent, reactive } from 'vue'
   import { useI18n } from 'vue-i18n'
 
   import { IFormData } from '@/interfaces'
@@ -60,7 +60,7 @@
         required: true,
       },
     },
-    setup() {
+    setup(props) {
       const formData: IFormData = reactive({
         username: '',
         email: '',
@@ -69,6 +69,14 @@
       })
       const { t } = useI18n()
       const store = useStore()
+
+      const buttonText: ComputedRef<string> = computed(() =>
+        props.action === 'register' ? 'buttons.REGISTER' : 'buttons.LOGIN'
+      )
+      const errorMessage: ComputedRef<string | null> = computed(
+        () => store.getters[ROOT_STORE.GETTERS.ERROR_MESSAGE]
+      )
+
       function onSubmit(actionType: string) {
         return store.dispatch(USER_STORE.ACTIONS.LOGIN_OR_REGISTER, {
           actionType,
@@ -77,10 +85,9 @@
       }
 
       return {
-        errorMessage: computed(
-          () => store.getters[ROOT_STORE.GETTERS.ERROR_MESSAGE]
-        ),
         t,
+        buttonText,
+        errorMessage,
         formData,
         onSubmit,
       }
diff --git a/fittrackee_client/src/locales/en/buttons.json b/fittrackee_client/src/locales/en/buttons.json
index 27a83d7a..5631a0a0 100644
--- a/fittrackee_client/src/locales/en/buttons.json
+++ b/fittrackee_client/src/locales/en/buttons.json
@@ -1,3 +1,4 @@
 {
-  "LOGIN": "Log in"
+  "LOGIN": "Log in",
+  "REGISTER": "Register"
 }
\ No newline at end of file
diff --git a/fittrackee_client/src/locales/fr/buttons.json b/fittrackee_client/src/locales/fr/buttons.json
index 250d82fb..7496ec9d 100644
--- a/fittrackee_client/src/locales/fr/buttons.json
+++ b/fittrackee_client/src/locales/fr/buttons.json
@@ -1,3 +1,4 @@
 {
-  "LOGIN": "Se connecter"
+  "LOGIN": "Se connecter",
+  "REGISTER": "S'inscrire"
 }
\ No newline at end of file