diff --git a/addons/google_base_account/google_base_account_view.xml b/addons/google_base_account/google_base_account_view.xml
index 366c39f6414..d46a7cb9b27 100644
--- a/addons/google_base_account/google_base_account_view.xml
+++ b/addons/google_base_account/google_base_account_view.xml
@@ -23,8 +23,8 @@
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='preferences']" position="after">
                         <group string="Google Account" colspan="4">
-                            <field name="gmail_user"/>
-                            <field name="gmail_password" password="True"/>
+                            <field name="gmail_user" readonly="0"/>
+                            <field name="gmail_password" password="True" readonly="0"/>
                         </group>
                 </xpath>
             </field>
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index 824a9ddf06b..b81b69b7e44 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -161,7 +161,7 @@ class google_docs_ir_attachment(osv.osv):
         pool_gdoc_config = self.pool.get('google.docs.config')
         pool_model = self.pool.get("ir.model")
         attachment = {'url': False}
-        config = pool_gdoc_config.browse(cr, SUPERUSER_ID, config_id, context=context)
+        config = pool_gdoc_config.browse(cr, uid, config_id, context=context)
         if config:
             res_model = config.model_id
             model_ids = pool_model.search(cr, uid, [('model','=',res_model)])
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 8125a46ae7e..d253956201f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -29,7 +29,10 @@
                         <p class="oe_grey">
                             <b>To create a new filter:</b><br/>
                             - Go to the OpenERP document you want to filter. For instance, go to Opportunities and search on Sales Department.<br/>
-                            - In this same "Search" view, select the menu "Save Current Filter", enter the name (Ex: Sales Department) 
+                            - In this "Search" view, select the option "Save Current Filter", enter the name (Ex: Sales Department)<br/>
+                            - If you select "Share with all users", link of google document in "More" options will appear for all users in opportunities of Sales Department.<br/>
+                            - If you don't select "Share with all users", link of google document in "More" options will not appear for other users in opportunities of Sales Department.<br/>
+                            - If filter is not specified, link of google document will appear in "More" option for all users for all opportunities.
                         </p>
                     </div>
                     <field name='gdocs_template_url' placeholder="https://docs.google.com/document/d/1vOtpJK9scIQz6taD9tJRIETWbEw3fSiaQHArsJYcua4/edit" required="1"/>