diff --git a/pages/setup/Completed.vue b/pages/setup/Completed.vue
index ec969fd3..ad066490 100644
--- a/pages/setup/Completed.vue
+++ b/pages/setup/Completed.vue
@@ -1,8 +1,7 @@
 <template lang="pug">
   v-container
     v-card-title.d-block.text-h5.text-center(v-text="$t('setup.completed')")
-    v-card-text
-      p(v-html="$t('setup.completed_description', user)")
+    v-card-text(v-html="$t('setup.completed_description', user)")
     v-card-actions
       v-btn(text @click='next' color='primary' :loading='loading' :disabled='loading') {{$t('setup.start')}}
         v-icon mdi-arrow-right
diff --git a/pages/setup/index.vue b/pages/setup/index.vue
index 40d44322..60f261a5 100644
--- a/pages/setup/index.vue
+++ b/pages/setup/index.vue
@@ -31,7 +31,7 @@ import Completed from './Completed'
 export default {
   components: { DbStep, Settings, Completed },
   middleware: 'setup',
-  layout: 'iframe',
+  layout: 'clean',
   head: {
     title: 'Setup',
   },
diff --git a/server/api/mail.js b/server/api/mail.js
index d21df93d..4f110714 100644
--- a/server/api/mail.js
+++ b/server/api/mail.js
@@ -17,7 +17,7 @@ const mail = {
     TaskManager.add(task)
   },
 
-  _send (addresses, template, locals, locale) {
+  _send (addresses, template, locals, locale = settingsController.settings.instance_locale) {
     const settings = settingsController.settings
     log.info(`Send ${template} email to ${addresses} with locale ${locale}`)
     const email = new Email({