diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 4059ed9117f..c570ac5dd33 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -202,8 +202,8 @@ class config(osv.osv):
 
 config()
 
-class res_users(osv.osv):
-    _inherit = "res.users"
+class base_config_settings(osv.osv):
+    _inherit = "base.config.settings"
     
     def onchange_authorization_code(self, cr, uid, ids, authorization_code, context=None):
         res = {}
@@ -222,7 +222,16 @@ class res_users(osv.osv):
             if 'refresh_token' in content.keys():
                 ir_config.set_param(cr, uid, 'google_refresh_token', content['refresh_token'])
         return res
+    
+    def get_default_authorization_code(self, cr, uid, ids, context=None):
+        authorization_code = self.pool.get("ir.config_parameter").get_param(cr, uid, "authorization_code", context=context)
+        return {'authorization_code': authorization_code}
 
+    def set_authorization_code(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, "authorization_code", record.authorization_code or '', context=context)
+    
     _columns = {
-        'authorization_code': fields.char('Authorization Code', size=124),
+        'authorization_code': fields.char('Google Authorization Code', size=124),
     }
\ No newline at end of file
diff --git a/addons/google_docs/google_docs_data.xml b/addons/google_docs/google_docs_data.xml
index ea8d5dcd8ba..5ec29c12a7c 100644
--- a/addons/google_docs/google_docs_data.xml
+++ b/addons/google_docs/google_docs_data.xml
@@ -22,5 +22,9 @@
             <field name="value">-</field>
         </record>
 
+        <record id="config_authorization_code" model="ir.config_parameter">
+            <field name="key">authorization_code</field>
+            <field name="value">-</field>
+        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index ea796ee34b8..2e3d833814b 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -76,19 +76,7 @@
                 <xpath expr="//div[@name='google_docs']" position="after">
                     <div attrs="{'invisible': [('module_google_docs','=',False)]}">
                         <button type="action" name="%(google_docs.action_google_docs_users_config)d" string="Configure Template" class="oe_link" />
-                    </div>
-                </xpath>
-            </field>
-        </record>
-        
-        <record id="view_users_gogole_form" model="ir.ui.view">
-            <field name="name">res.users.google.form1</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook" position="inside">
-                    <page string="Google Authorization Code" attrs="{'invisible': [('id', '!=', 1)]}">
-                        <group string="Google Authorization Code">
+                        <group  >
                             <group >
                                 <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
                             </group>
@@ -96,20 +84,7 @@
                                 <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
                             </group>
                         </group>
-                    </page>
-                </xpath>
-            </field>
-        </record>
-        <record id="view_users_gogole_preference" model="ir.ui.view">
-            <field name="name">res.users.google.form2</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='preferences']" position="after">
-                        <group string="Google Account" attrs="{'invisible': [('id', '!=', 1)]}">
-                            <field name="authorization_code" on_change="onchange_authorization_code(authorization_code)"/>
-                            <a href="https://accounts.google.com/o/oauth2/auth?scope=https://www.googleapis.com/auth/drive&amp;redirect_uri=urn:ietf:wg:oauth:2.0:oob&amp;response_type=code&amp;client_id=39623646228-eg3ggo3mk6o40m7rguobi3rkl9frh4tb.apps.googleusercontent.com" target="_blank" class="oe_link"><b>Generate Authorization Code</b></a>
-                        </group>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/google_docs/static/src/img/icon.png b/addons/google_docs/static/src/img/icon.png
new file mode 100644
index 00000000000..e7f64291ef9
Binary files /dev/null and b/addons/google_docs/static/src/img/icon.png differ