diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index fa697372901..717c20007d4 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -171,6 +171,7 @@ class config(osv.osv):
         'google_drive_resource_id': fields.function(_resource_get, type="char", string='Resource Id'),
         'google_drive_client_id': fields.function(_client_id_get, type="char", string='Google Client '),
         'name_template': fields.char('Google Drive Name Pattern', size=64, help='Choose how the new google drive will be named, on google side. Eg. gdoc_%(field_name)s', required=True),
+        'active': fields.boolean('Active'),
     }
 
     def onchange_model_id(self, cr, uid, ids, model_id, context=None):
@@ -184,6 +185,7 @@ class config(osv.osv):
 
     _defaults = {
         'name_template': 'Document %(name)s',
+        'active': True,
     }
 
     def _check_model_id(self, cr, uid, ids, context=None):
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index 728ef03c5dd..8e4cc5c60a5 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -23,6 +23,7 @@
                     <field name="model" invisible="1" />
                     <group>
                         <field name="name" />
+                        <field name="active" />
                         <field name="model_id" on_change="onchange_model_id(model_id)" />
                         <label for='filter_id' />
                         <div>
diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py
index 17de4a37e1b..28e4ca8f880 100644
--- a/addons/google_spreadsheet/google_spreadsheet.py
+++ b/addons/google_spreadsheet/google_spreadsheet.py
@@ -24,6 +24,7 @@ import re
 import requests
 
 from openerp.osv import osv
+from openerp import SUPERUSER_ID
 
 
 class base_config_settings(osv.osv):
@@ -59,7 +60,10 @@ class config(osv.osv):
         user = self.pool['res.users'].read(cr, uid, uid, ['login', 'password'], context=context)
         username = user['login']
         password = user['password']
-        config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
+        if self.pool['ir.module.module'].search_count(cr, SUPERUSER_ID, ['&', ('name', '=', 'auth_crypt'), ('state', '=', 'installed')]) == 1:
+            config_formula = '=oe_settings("%s";"%s")' % (url, dbname)
+        else:
+            config_formula = '=oe_settings("%s";"%s";"%s";"%s")' % (url, dbname, username, password)
         request = '''<feed xmlns="http://www.w3.org/2005/Atom"
       xmlns:batch="http://schemas.google.com/gdata/batch"
       xmlns:gs="http://schemas.google.com/spreadsheets/2006">
diff --git a/addons/google_spreadsheet/google_spreadsheet_data.xml b/addons/google_spreadsheet/google_spreadsheet_data.xml
index 04c2122fabb..19802e9d140 100644
--- a/addons/google_spreadsheet/google_spreadsheet_data.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_data.xml
@@ -6,6 +6,7 @@
             <field name="model_id" ref="base.model_res_partner"/>
             <field name="google_drive_template_url">https://docs.google.com/spreadsheet/ccc?key=0ApGVjjwUC-ygdDZ0TG5EQnRlLVFQNlFGdFN5b1ZrY1E</field>
             <field name="name_template">Reporting %(name)s</field>
+            <field name="active" eval="0" />
         </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_spreadsheet/google_spreadsheet_view.xml b/addons/google_spreadsheet/google_spreadsheet_view.xml
index f247880e03a..f12798cc4bc 100644
--- a/addons/google_spreadsheet/google_spreadsheet_view.xml
+++ b/addons/google_spreadsheet/google_spreadsheet_view.xml
@@ -24,7 +24,7 @@
                         <group>
                             <group>
                                 <field name="name" string="Name"/>
-                                <field name="url" />
+                                <field name="url" widget="url"/>
                             </group>
                             <group colspan="2">
                                 <label for="description" colspan="2"/>