diff --git a/resources/js/components/App.vue b/resources/js/components/App.vue
index 0bcc44c0..8003de2e 100644
--- a/resources/js/components/App.vue
+++ b/resources/js/components/App.vue
@@ -1,7 +1,12 @@
 <template>
-    <main class="main-section">
-        <router-view></router-view>
-    </main>
+    <div>
+        <div v-if="$appSettings.isDemoApp" class="demo has-background-warning has-text-centered is-size-7-mobile">
+            {{ $t('commons.demo_do_not_post_sensitive_data') }}
+        </div>
+        <main class="main-section">
+            <router-view></router-view>
+        </main>
+    </div>
 </template>
 
 <script>
diff --git a/resources/js/langs/locales.js b/resources/js/langs/locales.js
index 6ece5c07..de66e7b1 100644
--- a/resources/js/langs/locales.js
+++ b/resources/js/langs/locales.js
@@ -33,7 +33,8 @@ export default {
                 "change_your_password": "Change your password",
                 "password_successfully_changed": "Password successfully changed ",
                 "edit_account": "Edit account",
-                "profile_saved": "Profile successfully updated!"
+                "profile_saved": "Profile successfully updated!",
+                "welcome_to_demo_app_use_those_credentials": "Welcome to the 2FAuth demo.<br><br>You can connect using the email address <strong>demo@2fauth.app</strong> and the password <strong>demo</demo>"
             }
         },
         "commons": {
@@ -44,7 +45,8 @@ export default {
             "edit": "Edit",
             "delete": "Delete",
             "save": "Save",
-            "close": "Close"
+            "close": "Close",
+            "demo_do_not_post_sensitive_data": "This is a demo app, do not post any sensitive data"
         },
         "errors": {
             "resource_not_found": "Resource not found",
@@ -91,10 +93,6 @@ export default {
                 "show_token_as_dot": {
                     "label": "Show generated tokens as dot",
                     "help": "Replace generated token caracters with *** to ensure confidentiality. Do not affect the copy/paste feature."
-                },
-                "is_demo_app": {
-                    "label": "Set the app as a demo",
-                    "help": "If set to Yes, the app content (including the registered user) will be reset every hours. Use the 'demo' user and 'demo' password to connect to the app in demo mode."
                 }
             }
         },
@@ -300,7 +298,8 @@ export default {
                 "change_your_password": "Modifier votre mot de passe",
                 "password_successfully_changed": "Mot de passe modifié avec succès",
                 "edit_account": "Mis à jour du profil",
-                "profile_saved": "Profil mis à jour avec succès !"
+                "profile_saved": "Profil mis à jour avec succès !",
+                "welcome_to_demo_app_use_those_credentials": "bienvenue sur la démo de 2FAuth.<br><br>Vous pouvez vous connecter en utilisant l'adresse email <strong>demo@2fauth.app</strong> et le mot de passe <strong>demo</demo>"
             }
         },
         "commons": {
@@ -311,7 +310,8 @@ export default {
             "edit": "Modifier",
             "delete": "Supprimer",
             "save": "Enregistrer",
-            "close": "Fermer"
+            "close": "Fermer",
+            "demo_do_not_post_sensitive_data": "Site de démonstration, ne postez aucune donnée sensible"
         },
         "errors": {
             "resource_not_found": "Ressource introuvable",
@@ -358,10 +358,6 @@ export default {
                 "show_token_as_dot": {
                     "label": "Masquer les codes générés",
                     "help": "Remplace les caractères des codes générés par des *** pour garantir leur confidentialité. N'affecte pas la fonction copier/coller qui reste utilisable."
-                },
-                "is_demo_app": {
-                    "label": "Activer le mode Démo",
-                    "help": "Le mode Démo remet à zéro le contenu de l'application (y compris l'utilisateur enregistré) toutes les heures. Utilisez le compte 'demo' et le mot de passe 'demo' pour vous y connecter."
                 }
             }
         },
diff --git a/resources/js/views/auth/Login.vue b/resources/js/views/auth/Login.vue
index 984c0c7e..ef73f984 100644
--- a/resources/js/views/auth/Login.vue
+++ b/resources/js/views/auth/Login.vue
@@ -1,12 +1,13 @@
 <template>
     <form-wrapper :title="$t('auth.forms.login')" :fail="fail" :success="success">
+        <div v-if="$appSettings.isDemoApp" class="notification is-info has-text-centered" v-html="$t('auth.forms.welcome_to_demo_app_use_those_credentials')" />
         <form @submit.prevent="handleSubmit" @keydown="form.onKeydown($event)">
             <form-field :form="form" fieldName="email" inputType="email" :label="$t('auth.forms.email')" autofocus />
             <form-field :form="form" fieldName="password" inputType="password" :label="$t('auth.forms.password')" />
             <form-buttons :isBusy="form.isBusy" :caption="$t('auth.sign_in')" />
         </form>
         <p>{{ $t('auth.forms.dont_have_account_yet') }}&nbsp;<router-link :to="{ name: 'register' }" class="is-link">{{ $t('auth.register') }}</router-link></p>
-        <p>{{ $t('auth.forms.forgot_your_password') }}&nbsp;<router-link :to="{ name: 'password.request' }" class="is-link">{{ $t('auth.forms.request_password_reset') }}</router-link></p>
+        <p v-if="!$appSettings.isDemoApp">{{ $t('auth.forms.forgot_your_password') }}&nbsp;<router-link :to="{ name: 'password.request' }" class="is-link">{{ $t('auth.forms.request_password_reset') }}</router-link></p>
     </form-wrapper>
 </template>
 
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 60aa9e19..2ceb4aa6 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -45,7 +45,8 @@ return [
         'change_your_password' => 'Change your password',
         'password_successfully_changed' => 'Password successfully changed ',
         'edit_account' => 'Edit account',
-        'profile_saved' => 'Profile successfully updated!'
+        'profile_saved' => 'Profile successfully updated!',
+        'welcome_to_demo_app_use_those_credentials' => 'Welcome to the 2FAuth demo.<br><br>You can connect using the email address <strong>demo@2fauth.app</strong> and the password <strong>demo</demo>',
     ],
 
 ];
diff --git a/resources/lang/en/commons.php b/resources/lang/en/commons.php
index ef8af5dd..d5e0b302 100644
--- a/resources/lang/en/commons.php
+++ b/resources/lang/en/commons.php
@@ -20,5 +20,6 @@ return [
     'edit' => 'Edit',
     'delete' => 'Delete',
     'save' => 'Save',
-    'close' => 'Close'
+    'close' => 'Close',
+    'demo_do_not_post_sensitive_data' => 'This is a demo app, do not post any sensitive data',
 ];
\ No newline at end of file
diff --git a/resources/lang/fr/auth.php b/resources/lang/fr/auth.php
index 87a7f841..7f964c8d 100644
--- a/resources/lang/fr/auth.php
+++ b/resources/lang/fr/auth.php
@@ -45,7 +45,8 @@ return [
         'change_your_password' => 'Modifier votre mot de passe',
         'password_successfully_changed' => 'Mot de passe modifié avec succès',
         'edit_account' => 'Mis à jour du profil',
-        'profile_saved' => 'Profil mis à jour avec succès !'
+        'profile_saved' => 'Profil mis à jour avec succès !',
+        'welcome_to_demo_app_use_those_credentials' => 'bienvenue sur la démo de 2FAuth.<br><br>Vous pouvez vous connecter en utilisant l\'adresse email <strong>demo@2fauth.app</strong> et le mot de passe <strong>demo</demo>',
     ],
     
 
diff --git a/resources/lang/fr/commons.php b/resources/lang/fr/commons.php
index 0d8f1d37..230fdc98 100644
--- a/resources/lang/fr/commons.php
+++ b/resources/lang/fr/commons.php
@@ -20,5 +20,6 @@ return [
     'edit' => 'Modifier',
     'delete' => 'Supprimer',
     'save' => 'Enregistrer',
-    'close' => 'Fermer'
+    'close' => 'Fermer',
+    'demo_do_not_post_sensitive_data' => 'Site de démonstration, ne postez aucune donnée sensible',
 ];
\ No newline at end of file