diff --git a/addons/base_gengo/wizard/base_gengo_translations.py b/addons/base_gengo/wizard/base_gengo_translations.py
index 79e3897e264..dcf6e34c397 100644
--- a/addons/base_gengo/wizard/base_gengo_translations.py
+++ b/addons/base_gengo/wizard/base_gengo_translations.py
@@ -48,8 +48,11 @@ class base_gengo_translations(osv.osv_memory):
                                        ('receive', 'Receive Translation'),
                                        ('both', 'Both')], "Sync Type"),
         'lang_id': fields.many2one('res.lang', 'Language', required=True),
+        'sync_limit': fields.integer("No. of terms to sync"),
     }
-    _defaults = {'sync_type' : 'both'}
+    _defaults = {'sync_type' : 'both',
+                 'sync_limit' : 20
+         }
     def gengo_authentication(self, cr, uid, context=None):
         ''' 
         This method tries to open a connection with Gengo. For that, it uses the Public and Private
@@ -94,10 +97,12 @@ class base_gengo_translations(osv.osv_memory):
 
             ctx = context.copy()
             ctx['gengo_language'] = wizard.lang_id.id
+            if wizard.sync_limit > 200 or wizard.sync_limit < 1:
+                raise osv.except_osv(_("Warning"), _('Sync limit should between 1 to 200 for Gengo translation services.'))
             if wizard.sync_type in ['send','both']:
-                self._sync_request(cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+                self._sync_request(cr, uid, wizard.sync_limit, context=ctx)
             if wizard.sync_type in ['receive','both']:
-                self._sync_response( cr, uid, limit=GENGO_DEFAULT_LIMIT, context=ctx)
+                self._sync_response( cr, uid, wizard.sync_limit, context=ctx)
         return {'type': 'ir.actions.act_window_close'}
 
     def _sync_response(self, cr, uid, limit=GENGO_DEFAULT_LIMIT, context=None):
diff --git a/addons/base_gengo/wizard/base_gengo_translations_view.xml b/addons/base_gengo/wizard/base_gengo_translations_view.xml
index f4fed7e5ddd..f1d77730c47 100644
--- a/addons/base_gengo/wizard/base_gengo_translations_view.xml
+++ b/addons/base_gengo/wizard/base_gengo_translations_view.xml
@@ -10,7 +10,12 @@
                         <field name="lang_id"/>
                     </group>
                     <group>
-                            <field name="sync_type" widget="radio"/>
+	                    <group>
+	                            <field name="sync_type" widget="radio"/>
+	                    </group>
+	                    <group>
+	                            <field name="sync_limit" required="1"/>
+	                    </group>
                     </group>
                     <footer>
                         <button name="act_update" string="Send" type="object" class="oe_highlight"/> 
diff --git a/addons/website_gengo/controllers/main.py b/addons/website_gengo/controllers/main.py
index 59131f152ba..587c28df3f4 100644
--- a/addons/website_gengo/controllers/main.py
+++ b/addons/website_gengo/controllers/main.py
@@ -2,6 +2,9 @@
 
 from openerp.addons.web import http
 from openerp.addons.web.http import request
+
+GENGO_DEFAULT_LIMIT = 20
+
 class website_gengo(http.Controller):
 
     @http.route('/website/get_translated_length', type='json', auth='user', website=True)
@@ -27,3 +30,8 @@ class website_gengo(http.Controller):
         if user.company_id:
             request.registry['res.company'].write(request.cr, request.uid, user.company_id.id,config)
         return True
+
+    @http.route('/website/post_gengo_jobs', type='json', auth='user', website=True)
+    def set_gengo_config(self):
+        request.registry['base.gengo.translations']._sync_request(request.cr, request.uid, limit=GENGO_DEFAULT_LIMIT, context=request.context)
+        return True
diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index 5bc8c6b9017..546f9fe28f5 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -66,6 +66,7 @@
                             $('.oe_translatable_todo').addClass('oe_translatable_inprogress').removeClass('oe_translatable_todo');
                             self.$el.find('.gengo_wait').addClass("hidden");
                             self.$el.find('.gengo_inprogress,.gengo_discard').removeClass("hidden");
+                            openerp.jsonRpc('/website/post_gengo_jobs', 'call', {});
                             self.save();
                         }).fail(function () {
                             alert("Could not Post translation");