diff --git a/assets/style.less b/assets/style.less
index 7199a8df..00bd4bef 100644
--- a/assets/style.less
+++ b/assets/style.less
@@ -25,7 +25,7 @@ html, body {
 // }
 
 .el-card {
-  max-width: 630px;
+  max-width: 660px;
   margin: 30px auto;
 }
 
diff --git a/pages/settings.vue b/pages/settings.vue
index 81380793..8e77566a 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -1,13 +1,27 @@
 <template lang="pug">
   el-card
     nuxt-link.float-right(to='/')
-      v-icon(name='times' color='red')
+      el-button(circle  icon='el-icon-close' type='danger' size='small' plain)
     h5 {{$t('common.settings')}}
+    hr
 
-    el-form(action='/api/user' method='PUT' @submit.native.prevent='change_password')
-      el-form-item {{$t('settings.change_password')}}
+    el-form(action='/api/user' method='PUT' @submit.native.prevent='change_password' inline label-width='200px')
+
+      el-form-item(:label="$t('settings.change_password')")
         el-input(v-model='password' type='password')
-      el-button(type='success' native-type='submit') {{$t('common.send')}}
+          el-button(slot='append' type='success' native-type='submit') {{$t('common.send')}}
+
+      //- allow federation
+      div(v-if='settings.enable_federation')
+        el-form-item(:label="$t('admin.enable_federation')")
+          el-switch(name='reg' v-model='enable_federation')
+        
+        el-form-item(v-if='enable_federation' :label="$t('common.username')")
+          el-input(type='text' name='username' v-model='user.username' :suffix='"antani"' :readonly='user.username.length>0')
+            template(slot='suffix') @{{baseurl}}
+            //- el-button(slot='append') {{$t('common.save')}}
+
+
     
     el-divider {{$t('settings.danger_section')}}
     p {{$t('settings.remove_account')}}
@@ -20,11 +34,11 @@ import { Message, MessageBox } from 'element-ui'
 export default {
   data () {
     return {
+      enable_federation: false,
       password: '',
     }
   },
   name: 'Settings',
-  computed: mapState(['settings']),
   head () {
     return {
       title: `${this.settings.title} - ${this.$t('common.settings')}`
@@ -35,6 +49,12 @@ export default {
     user.mastodon_auth = ''
     return { user }
   },
+  computed: {
+    ...mapState(['settings']),
+    baseurl () {
+      return new URL(this.settings.baseurl).host
+    }
+  },
   methods: {
     async change_password () {
       if (!this.password) return
@@ -54,6 +74,8 @@ export default {
         type: 'error'
       }).then( () => {
         this.$axios.$delete('/user')
+        this.$auth.logout()
+        this.$router.replace('/')
       })
     }
   }