diff --git a/addons/google_base_account/google_base_account.py b/addons/google_base_account/google_base_account.py
index d733b6da77c..a6cf67bbe62 100644
--- a/addons/google_base_account/google_base_account.py
+++ b/addons/google_base_account/google_base_account.py
@@ -21,16 +21,17 @@
 
 from openerp.osv import osv
 from openerp import SUPERUSER_ID
+from openerp.tools.translate import _
 
-from httplib2 import Http
 import urllib
+import urllib2
 import simplejson
 
 
-class base_config_settings(osv.osv):
-    _inherit = "base.config.settings"
+class google_service(osv.osv):
+    _name = 'google.service'
 
-    def onchange_google_authorization_code(self, cr, uid, ids, service, authorization_code, context=None):
+    def generate_refresh_token(self, cr, uid, service, authorization_code, context=None):
         if authorization_code:
             ir_config = self.pool['ir.config_parameter']
             client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service)
@@ -41,11 +42,14 @@ class base_config_settings(osv.osv):
             headers = {"Content-type": "application/x-www-form-urlencoded"}
             data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code")
             data = urllib.urlencode(data)
-            resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+            try:
+                req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers)
+                content = urllib2.urlopen(req).read()
+            except urllib2.HTTPError:
+                raise self.pool.get('res.config.settings').get_config_warning(cr, _("Something went wrong during your token generation. Maybe your Authorization Code is invalid or already expired"), context=context)
+
             content = simplejson.loads(content)
-            if 'refresh_token' in content.keys():
-                ir_config.set_param(cr, uid, 'google_%s_refresh_token' % service, content['refresh_token'])
-        return {}
+        return content.get('refresh_token')
 
     def _get_google_token_uri(self, cr, uid, service, context=None):
         ir_config = self.pool['ir.config_parameter']
diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py
index 6bf3a01c905..e6cecfad596 100644
--- a/addons/google_drive/google_drive.py
+++ b/addons/google_drive/google_drive.py
@@ -23,8 +23,8 @@ from openerp import SUPERUSER_ID
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
 
-from httplib2 import Http
 import urllib
+import urllib2
 import json
 import re
 
@@ -59,26 +59,31 @@ class config(osv.osv):
 
     def copy_doc(self, cr, uid, res_id, template_id, name_gdocs, res_model, context=None):
         ir_config = self.pool['ir.config_parameter']
+        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
+        if not google_drive_refresh_token:
+            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         google_drive_client_id = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_id')
         google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret')
-        google_drive_refresh_token = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_refresh_token')
         google_web_base_url = ir_config.get_param(cr, SUPERUSER_ID, 'web.base.url')
 
         #For Getting New Access Token With help of old Refresh Token
-        headers = {"Content-type": "application/x-www-form-urlencoded"}
+        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"}
         data = dict(client_id=google_drive_client_id,
                     refresh_token=google_drive_refresh_token,
                     client_secret=google_drive_client_secret,
                     grant_type="refresh_token")
 
         data = urllib.urlencode(data)
-        resp, content = Http().request("https://accounts.google.com/o/oauth2/token", "POST", data, headers)
+        req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers)
+        content = urllib2.urlopen(req).read()
         content = json.loads(content)
 
         # Copy template in to drive with help of new access token
         if 'access_token' in content:
             request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, content['access_token'])
-            resp, parents = Http().request(request_url, "GET")
+            req = urllib2.Request(request_url, None, headers)
+            # resp, parents = Http().request(request_url, "GET")
+            parents = urllib2.urlopen(req).read()
             parents_dict = json.loads(parents)
 
             record_url = "Click on link to open Record in OpenERP\n %s/?db=%s#id=%s&model=%s" % (google_web_base_url, cr.dbname, res_id, res_model)
@@ -86,7 +91,9 @@ class config(osv.osv):
             request_url = "https://www.googleapis.com/drive/v2/files/%s/copy?access_token=%s" % (template_id, content['access_token'])
             headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
             data_json = json.dumps(data)
-            resp, content = Http().request(request_url, "POST", data_json, headers)
+            # resp, content = Http().request(request_url, "POST", data_json, headers)
+            req = urllib2.Request(request_url, data_json, headers)
+            content = urllib2.urlopen(req).read()
             content = json.loads(content)
             res = False
             if 'alternateLink' in content.keys():
@@ -94,8 +101,6 @@ class config(osv.osv):
                 attach_vals = {'res_model': res_model, 'name': name_gdocs, 'res_id': res_id, 'type': 'url', 'url': content['alternateLink']}
                 attach_pool.create(cr, uid, attach_vals)
                 res = content['alternateLink']
-        else:
-            raise self.pool.get('res.config.settings').get_config_warning(cr, _("You haven't configured 'Authorization Code' generated from google, Please generate and configure it in %(menu:base_setup.menu_general_configuration)s."), context=context)
         return res
 
     def get_google_drive_config(self, cr, uid, res_model, res_id, context=None):
@@ -192,5 +197,10 @@ class base_config_settings(osv.osv):
         'google_drive_uri': fields.char('URI', readonly=True, help="The URL to generate the authorization code from Google"),
     }
     _defaults = {
-        'google_drive_uri': lambda s, cr, uid, c: s._get_google_token_uri(cr, uid, 'drive', context=c),
+        'google_drive_uri': lambda s, cr, uid, c: s.pool['google.service']._get_google_token_uri(cr, uid, 'drive', context=c),
     }
+
+    def set_google_authorization_code(self, cr, uid, ids, context=None):
+        config = self.browse(cr, uid, ids[0], context)
+        refresh_token = self.pool['google.service'].generate_refresh_token(cr, uid, 'drive', config.google_drive_authorization_code, context=context)
+        self.pool['ir.config_parameter'].set_param(cr, uid, 'google_drive_refresh_token', refresh_token)
diff --git a/addons/google_drive/google_drive_data.xml b/addons/google_drive/google_drive_data.xml
index 9bb81e2744a..6204f455bf3 100644
--- a/addons/google_drive/google_drive_data.xml
+++ b/addons/google_drive/google_drive_data.xml
@@ -14,12 +14,8 @@
 
         <record id="config_google_drive_refresh_token" model="ir.config_parameter">
             <field name="key">google_drive_refresh_token</field>
-            <field name="value">-</field>
+            <field name="value"></field>
         </record>
 
-        <record id="config_google_drive_authorization_code" model="ir.config_parameter">
-            <field name="key">google_drive_authorization_code</field>
-            <field name="value">-</field>
-        </record>
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/google_drive/res_config_user_view.xml b/addons/google_drive/res_config_user_view.xml
index 8dfdee31143..728ef03c5dd 100644
--- a/addons/google_drive/res_config_user_view.xml
+++ b/addons/google_drive/res_config_user_view.xml
@@ -79,7 +79,7 @@
                         <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" />
+                            <field name="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>