diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index fcb67c9fdc6..73685be95df 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -84,7 +84,7 @@
                     <group>
                         <label for="id" string="Google Drive"/>
                         <div name="google_drive">
-                            <div name="google_docs">
+                            <div name="module_google_drive">
                                 <field name="module_google_drive" class="oe_inline"/>
                                 <label for="module_google_drive"/>
                             </div>
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 04834e6680b..02045b06c7c 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -214,7 +214,7 @@ class base_config_settings(osv.osv):
     _inherit = "base.config.settings"
 
     _columns = {
-        'google_drive_authorization_code': fields.char('Paste Generated "Authorization Code" from google to here', size=124),
+        'google_drive_authorization_code': fields.char('Authorization Code', size=124),
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index cbcbb46bc44..6bb6ed3a5b3 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -73,17 +73,14 @@
             <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='google_drive']" position="after">
+                <xpath expr="//div[@name='module_google_drive']" position="after">
                     <div attrs="{'invisible': [('module_google_drive','=',False)]}">
-                        <p class="oe_gray" >
-                            <div class="oe_inline">
-                                Click here to <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
-                            </div>
-                            <group>
-                                <field  name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)"/>''
-                            </group>
-                            Configure your templates and link your google document to OpenERP records <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure Template" class="oe_link" />
-                        </p>
+                        <div class="oe_inline">
+                            <field name="google_drive_uri" widget="url" text="Generate Google Authorization Code" class="oe_inline oe_bold"/>
+                            and paste it here
+                            <field name="google_drive_authorization_code" on_change="onchange_google_authorization_code('drive', google_drive_authorization_code)" class="oe_inline" />
+                        </div>
+                        <button type="action" name="%(google_drive.action_google_drive_users_config)d" string="Configure your templates" class="oe_link" />
                     </div>
                 </xpath>
             </field>