diff --git a/components/Login.vue b/components/Login.vue
index fa577eda..941d8517 100644
--- a/components/Login.vue
+++ b/components/Login.vue
@@ -1,5 +1,5 @@
 <template lang='pug'>
-  el-dialog(:visible='show' @close='close'
+  el-dialog(:visible='show' @close='close' :close-on-click-modal='false'
     append-to-body :title="$t('common.login')")
 
     p(v-html="$t('login.description')")
diff --git a/components/Register.vue b/components/Register.vue
index cc03ab17..70aea48d 100644
--- a/components/Register.vue
+++ b/components/Register.vue
@@ -1,5 +1,5 @@
 <template lang='pug'>
-  el-dialog(:visible='show' @close='close'
+  el-dialog(:visible='show' @close='close' :close-on-click-modal='false'
     append-to-body :title="$t('common.register')")
 
     p(v-html="$t('register.description')")
@@ -18,7 +18,7 @@
       el-input.mb-2(v-model='user.description' type="textarea" rows='3' :placeholder="$t('common.description')")
 
     span(slot='footer')
-      el-button(plain type="success" :disabled='disabled' @click='register') {{$t('common.send')}} <v-icon :name='loading?"circle-notch":"chevron-right"' :spin='loading'/>
+      el-button(plain type="success" :disabled='disabled' @click='register') {{$t('common.send')}} <v-icon name='chevron-right'/>
 </template>
 
 <script>
diff --git a/locales/email/it.json b/locales/email/it.json
index a75891a1..f4155581 100644
--- a/locales/email/it.json
+++ b/locales/email/it.json
@@ -5,11 +5,11 @@
   },
   "confirm": {
     "subject": "Puoi iniziare a pubblicare eventi",
-    "content": "Ciao, il tuo account su <a href='{{config.baseurl}}'>{{config.title}}</a> è stato creato."
+    "content": "Ciao, il tuo account su <a href='{{config.baseurl}}'>{{config.title}}</a> è stato confermato. Scrivici a {{config.admin}} per qualsiasi informazione e fai a modino."
   },
   "user_confirm": {
     "subject": "Puoi iniziare a pubblicare eventi",
-    "content": "Ciao, il tuo account su <a href='{{config.baseurl}}'>{{config.title}}</a> è stato creato. <a href='{{config.baseurl}}/user_confirm/{{user.recover_code}}'>Confermalo</a>."
+    "content": "Ciao, il tuo account su <a href='{{config.baseurl}}'>{{config.title}}</a> è stato creato. <a href='{{config.baseurl}}/user_confirm/{{user.recover_code}}'>Confermalo e scegli una password</a>."
   },
   "recover": {
     "subject": "Recupero password",
diff --git a/locales/en.js b/locales/en.js
index cdb80edb..cffdd269 100644
--- a/locales/en.js
+++ b/locales/en.js
@@ -179,7 +179,7 @@ Adding this link to your feed reader will keep you up to date.`,
   confirm: {
     title: 'User confirmation',
     not_valid: 'Mmmmm something goes wrong.',
-    valid: 'Your account is confirmed, you can <a href="/login">log in</a>.'
+    valid: 'Your account is confirmed, you can <a href="/?ref=login">log in</a>.'
   },
 
   ordinal: {
diff --git a/locales/it.js b/locales/it.js
index 480f0570..b78f3bea 100644
--- a/locales/it.js
+++ b/locales/it.js
@@ -184,7 +184,7 @@ export default {
   confirm: {
     title: 'Conferma utente',
     not_valid: 'Mmmmm qualcosa è andato storto.',
-    valid: 'Il tuo account è stato confermato, ora puoi <a href="/login">entrare</a>'
+    valid: 'Il tuo account è stato confermato, ora puoi <a href="/?ref=login">entrare</a>'
   },
 
   ordinal: {
diff --git a/pages/recover/_code.vue b/pages/recover/_code.vue
index 48e164e2..23846980 100644
--- a/pages/recover/_code.vue
+++ b/pages/recover/_code.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  el-dialog(:visible='true' @close="$router.push('/')")
+  el-dialog(:visible='true' @close="$router.push('/')" :close-on-click-modal='false')
     template(slot='title')
       h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link>  {{$t('common.recover_password')}}
     div(v-if='valid')
@@ -35,7 +35,7 @@ export default {
           type: 'success',
           message: this.$t('common.password_updated')
         })
-        this.$router.replace('/login')
+        this.$router.replace('/?ref=login')
       } catch (e) {
         Message({
           showClose: true,
diff --git a/pages/user_confirm/_code.vue b/pages/user_confirm/_code.vue
index 5ac50606..774039df 100644
--- a/pages/user_confirm/_code.vue
+++ b/pages/user_confirm/_code.vue
@@ -1,9 +1,7 @@
 <template lang="pug">
-  el-card
-    nuxt-link.float-right(to='/')
-      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
+  el-main
+    h4 <nuxt-link to='/'><img src='/favicon.ico'/></nuxt-link> {{$t('common.set_password')}}
 
-    h5 <img src='/favicon.ico'/> {{$t('common.set_password')}}
     div(v-if='valid')
       el-form
         el-form-item {{$t('common.new_password')}}
@@ -40,7 +38,7 @@ export default {
           type: 'success',
           message: this.$t('common.password_updated')
         })
-        this.$router.replace('/login')
+        this.$router.replace('/?ref=login')
       } catch (e) {
         Message({
           showClose: true,
diff --git a/pages/user_confirm_pwd/_code.vue b/pages/user_confirm_pwd/_code.vue
index 03f5ed08..8e78b1f1 100644
--- a/pages/user_confirm_pwd/_code.vue
+++ b/pages/user_confirm_pwd/_code.vue
@@ -39,7 +39,7 @@ export default {
           type: 'success',
           message: this.$t('common.password_updated')
         })
-        this.$router.replace('/login')
+        this.$router.replace('/?ref=login')
       } catch (e) {
         Message({
           showClose: true,