diff --git a/app/components/header.vue b/app/components/header.vue
index 8e78c6e..8b83bc8 100644
--- a/app/components/header.vue
+++ b/app/components/header.vue
@@ -17,9 +17,6 @@
         <div class="bg-inverse p-a-1">
             <div class="container">
                 <div class="col-lg-12">
-                    <div class="alert alert-danger" v-if="error">
-                        <p>{{{$t('header.credentials_invalids')}}}</p>
-                    </div>
                     <form class="form-inline pull-md-right">
                         <div class="form-group form">
                             <label class="sr-only" for="email">{{$t('header.Email')}}</label>
diff --git a/app/components/password-generator.vue b/app/components/password-generator.vue
index b28dfc5..a97c47c 100644
--- a/app/components/password-generator.vue
+++ b/app/components/password-generator.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="container m-t-3">
+    <div id="password-generator" class="container m-t-3">
         <form>
             <div class="form-group row">
                 <div class="col-lg-3 m-b-1">
diff --git a/app/locales/locales.js b/app/locales/locales.js
index 5b723ea..0e7cc01 100644
--- a/app/locales/locales.js
+++ b/app/locales/locales.js
@@ -2,8 +2,8 @@ const locales = {
     "en": {
         "lang": "en",
         "header": {
-            "Email":"Email",
-            "Password":"Password",
+            "Email": "Email",
+            "Password": "Password",
             "Sign_in": "Sign_in",
             "Register": "Register",
             "title": "Next generation<br>password manager",
@@ -89,8 +89,8 @@ const locales = {
     "fr": {
         "lang": "fr",
         "header": {
-            "Email":"Email",
-            "Password":"Mot de passe",
+            "Email": "Email",
+            "Password": "Mot de passe",
             "Sign_in": "Connexion",
             "Register": "S'enregistrer",
             "title": "Gestionnaire de mot de passe nouvelle génération",
@@ -170,6 +170,9 @@ const locales = {
             "create_account": "Créez un compte",
             "welcome": "Connexion réussie, bienvenue sur LessPass",
             "credentials_invalids": "L' adresse e-mail et/ou mot de passe sont invalides"
+        },
+        "register": {
+            "beta" : "LessPass Application est pour l'instant en version beta. Vous pouvez utilisez LessPass <a href='#password-generator'><b>en mode deconnecté</b></a>"
         }
     }
 };
diff --git a/app/main.js b/app/main.js
index 7fa9af7..af95999 100644
--- a/app/main.js
+++ b/app/main.js
@@ -36,10 +36,6 @@ router.map({
     }
 });
 
-router.beforeEach(function () {
-    window.scrollTo(0, 0)
-});
-
 router.redirect({
     '*': '/'
 });
diff --git a/app/services/auth.js b/app/services/auth.js
index 4f4e6d1..02b58fa 100644
--- a/app/services/auth.js
+++ b/app/services/auth.js
@@ -27,11 +27,10 @@ export default {
         var self = this;
         context.$http.post('/api/users/', user).then(
             function (response) {
-                localStorage.setItem('token', response.data.token);
-                router.go('/');
+                logging.warning(this.$t('register.beta'));
             },
             function (error) {
-                context.error = true;
+                logging.warning(this.$t('register.beta'));
             }
         );
     },