diff --git a/bemade_mailcow_integration/models/res_config_settings.py b/bemade_mailcow_integration/models/res_config_settings.py
index 07d285a..e0b47e5 100644
--- a/bemade_mailcow_integration/models/res_config_settings.py
+++ b/bemade_mailcow_integration/models/res_config_settings.py
@@ -17,4 +17,9 @@ class ResConfigSettings(models.TransientModel):
     mailcow_sync_alias = fields.Boolean(
         string='Sync Aliases with Odoo',
         help='Auto create Aliases in Mailcow from Odoo',
-        config_parameter='mailcow.sync_alias')
\ No newline at end of file
+        config_parameter='mailcow.sync_alias')
+
+    mailcow_auto_create = fields.Boolean(
+        string='Create Mailboxes in Mailcow',
+        help='Auto create Mailboxes in Mailcow on creation in Odoo',
+        config_parameter='mailcow.create_mailbox')
diff --git a/bemade_mailcow_integration/models/res_users.py b/bemade_mailcow_integration/models/res_users.py
index 884fdbc..34f8efb 100644
--- a/bemade_mailcow_integration/models/res_users.py
+++ b/bemade_mailcow_integration/models/res_users.py
@@ -3,13 +3,34 @@ from odoo import models, fields, api
 class ResUsers(models.Model):
     _inherit = 'res.users'
 
+    # def _compute_create_mailcow_mailbox(self):
+    #     params = self.env['ir.config_parameter'].sudo()
+    #     can_create = params.get_param('mailcow.create_mailbox')
+    #     return can_create
+
     mailcow_mailbox = fields.Boolean(string='Mailcow Mailbox', default=False)
 
+    # can_create_mailcow_mailbox = fields.Boolean(
+    #     string='Create Mailcow Mailbox',
+    #     compute=_compute_create_mailcow_mailbox
+    # )
+
+    mailcow_auto_create = fields.Boolean(compute='_compute_mailcow_auto_create', string='Create Mailbox in Mailcow')
+
+
+    def _compute_mailcow_auto_create(self):
+        for rec in self:
+            config = self.env['ir.config_parameter'].sudo()
+            get_mailcow_auto_create = config.get_param('mailcow_auto_create', False)
+            rec.mailcow_auto_create = get_mailcow_auto_create
+
+
     @api.model
     def create(self, vals):
         res = super(ResUsers, self).create(vals)
 
-        if vals.get('mailcow_mailbox', false):
+        if res.mailcow_mailbox:
             self.env['mail.mailcow.mailbox'].create_mailbox_for_user(res)
 
         return res
+
diff --git a/bemade_mailcow_integration/views/res_config_settings_views.xml b/bemade_mailcow_integration/views/res_config_settings_views.xml
index d641fc7..a0a2d66 100644
--- a/bemade_mailcow_integration/views/res_config_settings_views.xml
+++ b/bemade_mailcow_integration/views/res_config_settings_views.xml
@@ -8,29 +8,44 @@
             <div id="emails" position='after'>
                 <div id="mailcow">
                     <h2>Mailcow Settings</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <label for="mailcow_base_url" string="Mailcow URL"/>
-                            <div class="text-muted">
-                                Base URL for Mailcow server
+                    <div class="row mt16 o_settings_container" name="mailcow_setting">
+                        <div class="col-xs-12 col-md-6 o_setting_box" id="mail_setting_creds">
+                            <div class="o_setting_right_pane" id="mailcow_settings_creds_settings">
+                                <label for="mailcow_base_url" string="Mailcow URL"/>
+                                <div class="text-muted">
+                                    Base URL for Mailcow server
+                                </div>
+                                <div class="content-group">
+                                    <field name="mailcow_base_url"/>
+                                </div>
+                                <label for="mailcow_api_key" string="API Key"/>
+                                <div class="text-muted">
+                                    Mailcow API Key
+                                </div>
+                                <div class="content-group">
+                                    <field name="mailcow_api_key"/>
+                                </div>
                             </div>
-                            <div class="content-group">
-                                <field name="mailcow_base_url"/>
-                            </div>
-                            <label for="mailcow_api_key" string="API Key"/>
-                            <div class="text-muted">
-                                Mailcow API Key
-                            </div>
-                            <div class="content-group">
-                                <field name="mailcow_api_key"/>
-                            </div>
-                            <label for="mailcow_sync_alias" string="Sync Aliases with Odoo'"/>
-                            <div class="text-muted">
-                                Auto create Aliases in Mailcow from Odoo
-                            </div>
-                            <div class="content-group">
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box" name="mailcow_setting_options">
+                            <div class="o_setting_left_pane">
                                 <field name="mailcow_sync_alias"/>
                             </div>
+                            <div class="o_setting_right_pane">
+                                <label for="mailcow_sync_alias" string="Sync Aliases with Odoo"/>
+                                <div class="text-muted">
+                                    Auto create Aliases in Mailcow from Odoo
+                                </div>
+                            </div>
+                            <div class="o_setting_left_pane">
+                                <field name="mailcow_auto_create"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="mailcow_auto_create" string="Create mailbox in Mailcow"/>
+                                <div class="text-muted">
+                                    Auto create Mailbox in Mailcow on creation in Odoo
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/bemade_mailcow_integration/views/res_users_views.xml b/bemade_mailcow_integration/views/res_users_views.xml
index 366beda..5abee28 100644
--- a/bemade_mailcow_integration/views/res_users_views.xml
+++ b/bemade_mailcow_integration/views/res_users_views.xml
@@ -5,15 +5,12 @@
         <field name="model">res.users</field>
         <field name="inherit_id" ref="base.view_users_form"/>
         <field name="arch" type="xml">
-            <data>
-                <xpath expr="//notebook" position="inside">
-                    <page string="Mailcow" name="mailcow">
-                        <group>
-                            <field name="mailcow_mailbox"/>
-                        </group>
-                    </page>
-                </xpath>
-            </data>
+            <field name="email" position="before">
+                <div id="mailcow_mailcow" attrs="{'invisible': [('id', '!=', False)]}">
+                    <label for="mailcow_mailbox" string="Create mailbox on Mailcow"/>
+                    <field name="mailcow_mailbox"/>
+                </div>
+            </field>
         </field>
     </record>
 </odoo>