diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index 059a674e5f1..a14b42c97bf 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -32,6 +32,8 @@ class base_config_settings(osv.osv_memory):
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
         'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
+        'module_auth_signup': fields.boolean('allow new users to sign up'),
+        'module_auth_oauth': fields.boolean('external oauth authentfication (google, facebook, ...)'),
     }
 
     def open_company(self, cr, uid, ids, context=None):
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fe0fc7d1254..fd1bd104a3c 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,6 +27,16 @@
                             </div>
                         </div>
                     </group>
+                    <group>
+                        <label for="id" string="Email"/>
+                        <div>
+                            <div>
+                                <button type="action"
+                                    name="%(base.action_ir_mail_server_list)d"
+                                    string="Configure outgoing email servers" class="oe_link"/>
+                            </div>
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Share Data"/>
                         <div>
@@ -38,10 +48,18 @@
                                 <field name="module_portal" class="oe_inline"/>
                                 <label for="module_portal"/>
                             </div>
+                        </div>
+                    </group>
+                    <group>
+                        <label for="id" string="Authentification"/>
+                        <div>
                             <div>
-                                <button type="action"
-                                    name="%(base.action_ir_mail_server_list)d"
-                                    string="Configure outgoing email servers" class="oe_link"/>
+                                <field name="module_auth_signup" class="oe_inline"/>
+                                <label for="module_auth_signup"/>
+                            </div>
+                            <div>
+                                <field name="module_auth_oauth" class="oe_inline"/>
+                                <label for="module_auth_oauth"/>
                             </div>
                         </div>
                     </group>