diff --git a/addons/auth_oauth/__init__.py b/addons/auth_oauth/__init__.py
index c9acce48a16..a56db75633b 100644
--- a/addons/auth_oauth/__init__.py
+++ b/addons/auth_oauth/__init__.py
@@ -1,3 +1,4 @@
 import controllers
 import auth_oauth
 import res_users
+import res_config
diff --git a/addons/auth_oauth/__openerp__.py b/addons/auth_oauth/__openerp__.py
index 6c79bba2151..c8d9c85c265 100644
--- a/addons/auth_oauth/__openerp__.py
+++ b/addons/auth_oauth/__openerp__.py
@@ -28,12 +28,13 @@
     'author': 'Victor Tabuenca',
     'maintainer': 'OpenERP s.a.',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'web'],
+    'depends': ['base', 'web', 'base_setup'],
     'data': [
-        'auth_oauth_data.xml'
+        'auth_oauth_data.xml',
     ],
     'update_xml': [
-        'auth_oauth_view.xml'
+        'auth_oauth_view.xml',
+        'res_config_view.xml',
     ],
     'js': [
         'static/src/js/auth_oauth.js',
diff --git a/addons/auth_oauth/auth_oauth_view.xml b/addons/auth_oauth/auth_oauth_view.xml
index 678c347c84d..23e05e7a31f 100644
--- a/addons/auth_oauth/auth_oauth_view.xml
+++ b/addons/auth_oauth/auth_oauth_view.xml
@@ -23,6 +23,7 @@
                 </form>
             </field>
         </record>
+        
         <record model="ir.ui.view" id="view_oauth_provider_list">
             <field name="name">auth.oauth.provider.list</field>
             <field name="model">auth.oauth.provider</field>
diff --git a/addons/auth_oauth/res_config.py b/addons/auth_oauth/res_config.py
new file mode 100644
index 00000000000..0c660aa585c
--- /dev/null
+++ b/addons/auth_oauth/res_config.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2012-Today OpenERP SA (<http://www.openerp.com>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+
+from openerp.osv import osv, fields
+
+class project_configuration(osv.TransientModel):
+    _inherit = 'base.config.settings'
+
+    _columns = {
+        'explanation' : fields.text('Deployment Explanation',),
+        'client_id' : fields.char('Client ID'),
+    }
+
+    # def get_default_alias_domain(self, cr, uid, ids, context=None):
+    #     return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)}
+
+    # def set_alias_domain(self, cr, uid, ids, context=None):
+    #     config_parameters = self.pool.get("ir.config_parameter")
+    #     for record in self.browse(cr, uid, ids, context=context):
+    #         config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context)
\ No newline at end of file
diff --git a/addons/auth_oauth/res_config_view.xml b/addons/auth_oauth/res_config_view.xml
new file mode 100644
index 00000000000..c892c8ac5e4
--- /dev/null
+++ b/addons/auth_oauth/res_config_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>        
+<openerp>
+    <data>
+        <record model="ir.ui.view" id="view_general_configuration_auth_oauth">
+            <field name="name">base.config.auth.oauth</field>
+            <field name="model">model</field>
+            <field name="type">base.config.settings</field>
+            <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='module_auth_signup']" position="after">
+                    <label for="explanation" class="oe_inline"/>
+                    <field name="explanation" placeholder="Here goes the explanation" class="oe_inline"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 5e49f6d4c5f..91196c7e834 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -27,7 +27,7 @@
                             </div>
                         </div>
                     </group>
-                    <group name="email">
+                    <group>
                         <label for="id" string="Email"/>
                         <div name="email">
                             <div>
@@ -57,7 +57,6 @@
                                 <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"/>
diff --git a/addons/mail/res_config_view.xml b/addons/mail/res_config_view.xml
index 99c19c894b1..2b3784cc15f 100644
--- a/addons/mail/res_config_view.xml
+++ b/addons/mail/res_config_view.xml
@@ -6,9 +6,10 @@
             <field name="model">base.config.settings</field>
             <field name="inherit_id" ref="base_setup.view_general_configuration"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='email']" position='inside' version="7.0">
+                <xpath expr="//div[@name='email']" position='inside'>
                     <div>
-                        <label for="alias_domain" class="oe_inline"/><field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>
+                        <label for="alias_domain" class="oe_inline"/>
+                        <field name="alias_domain" placeholder="mycompany.my.openerp.com" class="oe_inline"/>                        
                     </div>
                 </xpath>
             </field>