diff --git a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
index 6ba98e15ef6..a0615035cde 100644
--- a/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
+++ b/addons/website_crm_partner_assign/static/src/js/crm_partner_assign.js
@@ -2,9 +2,7 @@ odoo.define('crm.partner_assign', function (require) {
 'use strict';
 
 var Model = require('web.Model');
-var time = require('web.time');
 var website = require('website.website');
-
 /*
  * This file is intended to add interactivity to survey forms rendered by
  * the website engine.
@@ -19,107 +17,131 @@ if(!interested_form.length && !desinterested_form.length && !opp_stage_buttons.l
 }
 
 $('.interested_partner_assign_confirm').on('click',function(e){
-	if ($('.interested_partner_assign_form .comment_interested').val() && $('.interested_partner_assign_form .contacted_interested').prop('checked')){
-		new Model('crm.lead')
-			.call("partner_interested",[[parseInt($('.interested_partner_assign_form .assign_lead_id').val())], $('.interested_partner_assign_form .comment_interested').val()])
-			.then(function(){
-				window.location.href = '/my/leads';
-			});
-	}else{
-		$('.interested_partner_assign_form .error_partner_assign_interested').css('display', 'block');
-	}
-	return false;
+    var $btn = $(this);
+    if ($('.interested_partner_assign_form .comment_interested').val() && $('.interested_partner_assign_form .contacted_interested').prop('checked')){
+        $btn.prop('disabled', true);
+        new Model('crm.lead')
+            .call("partner_interested",[[parseInt($('.interested_partner_assign_form .assign_lead_id').val())], $('.interested_partner_assign_form .comment_interested').val()])
+            .then(function(){
+                window.location.href = '/my/leads';
+            })
+            .always(function() {
+                $btn.prop('disabled', false);
+            });
+    }else{
+        $('.interested_partner_assign_form .error_partner_assign_interested').css('display', 'block');
+    }
+    return false;
 });
 
 
-$('.desinterested_partner_assign_confirm').on('click',function(e){
-	new Model('crm.lead')
-		.call("partner_desinterested",
-			[[parseInt($('.desinterested_partner_assign_form .assign_lead_id').val())],
-			$('.desinterested_partner_assign_form .comment_desinterested').val(),
-			$('.desinterested_partner_assign_form .contacted_desinterested').prop('checked'),
-			$('.desinterested_partner_assign_form .customer_mark_spam').prop('checked'),
-			])
-		.then(function(){
-			window.location.href = '/my/leads';
-		});
-	return false;
+$('.desinterested_partner_assign_confirm').on('click',function(){
+    var $btn = this;
+    $btn.prop('disabled', true);
+    new Model('crm.lead')
+        .call("partner_desinterested",
+            [[parseInt($('.desinterested_partner_assign_form .assign_lead_id').val())],
+            $('.desinterested_partner_assign_form .comment_desinterested').val(),
+            $('.desinterested_partner_assign_form .contacted_desinterested').prop('checked'),
+            $('.desinterested_partner_assign_form .customer_mark_spam').prop('checked'),
+            ])
+        .then(function(){
+            window.location.href = '/my/leads';
+        }).always(function() {
+            $btn.prop('disabled', false);
+        });
+    return false;
 });
 
 opp_stage_buttons.on('click',function(e){
-	new Model('crm.lead')
-		.call("write", [[parseInt(e.currentTarget.getAttribute('opp'))],{
-			stage_id: parseInt(e.currentTarget.getAttribute('data')),
-		},], {context: {website_partner_assign:1}})
-		.done(function () {
-			window.location.reload();
-		});
+    var $btn = this;
+    $btn.prop('disabled', true);
+    new Model('crm.lead')
+        .call("write", [[parseInt(e.currentTarget.getAttribute('opp'))],{
+            stage_id: parseInt(e.currentTarget.getAttribute('data')),
+        },], {context: {website_partner_assign:1}})
+        .fail(function() {
+            $btn.prop('disabled', false);
+        })
+        .done(function () {
+            window.location.reload();
+        });
 });
 
-$('.edit_contact_form .country_id').on('change', function(e){
-	var country_id = $('.edit_contact_form .country_id').find(":selected").attr('value');
-	$(".edit_contact_form .state[country!="+country_id+"]").css('display','none');
-	$(".edit_contact_form .state[country="+country_id+"]").css('display','block');
+$('.edit_contact_form .country_id').on('change', function(){
+    var country_id = $('.edit_contact_form .country_id').find(":selected").attr('value');
+    $(".edit_contact_form .state[country!="+country_id+"]").css('display','none');
+    $(".edit_contact_form .state[country="+country_id+"]").css('display','block');
 });
 
-$('.edit_contact_confirm').on('click',function(e){
-	new Model('crm.lead')
-		.call("write", [[parseInt($('.edit_contact_form .opportunity_id').val())],{
-			partner_name: $('.edit_contact_form .partner_name').val(),
-			phone: $('.edit_contact_form .phone').val(),
-			mobile: $('.edit_contact_form .mobile').val(),
-			email_from: $('.edit_contact_form .email_from').val(),
-			street: $('.edit_contact_form .street').val(),
-			street2: $('.edit_contact_form .street2').val(),
-			city: $('.edit_contact_form .city').val(),
-			zip: $('.edit_contact_form .zip').val(),
-			state_id: parseInt($('.edit_contact_form .state_id').find(":selected").attr('value')),
-			country_id: parseInt($('.edit_contact_form .country_id').find(":selected").attr('value')),
-		}])
-		.done(function(response){
-			window.location.reload();
-		});
-	return false;
+$('.edit_contact_confirm').on('click',function(){
+    var $btn = this;
+    $btn.prop('disabled', true);
+    new Model('crm.lead')
+        .call("write", [[parseInt($('.edit_contact_form .opportunity_id').val())],{
+            partner_name: $('.edit_contact_form .partner_name').val(),
+            phone: $('.edit_contact_form .phone').val(),
+            mobile: $('.edit_contact_form .mobile').val(),
+            email_from: $('.edit_contact_form .email_from').val(),
+            street: $('.edit_contact_form .street').val(),
+            street2: $('.edit_contact_form .street2').val(),
+            city: $('.edit_contact_form .city').val(),
+            zip: $('.edit_contact_form .zip').val(),
+            state_id: parseInt($('.edit_contact_form .state_id').find(":selected").attr('value')),
+            country_id: parseInt($('.edit_contact_form .country_id').find(":selected").attr('value')),
+        }])
+        .fail(function() {
+            $btn.prop('disabled', false);
+        })
+        .done(function(){
+            window.location.reload();
+        });
+    return false;
 });
 
-$('.edit_opp_confirm').on('click',function(e){
-	new Model('crm.lead')
-		.call("update_lead_portal", [[parseInt($('.edit_opp_form .opportunity_id').val())],{
-			activity_id: parseInt($('.edit_opp_form .next_activity').find(":selected").attr('data')),
-			planned_revenue: parseFloat($('.edit_opp_form .planned_revenue').val()),
-			probability: parseFloat($('.edit_opp_form .probability').val()),
-			date_deadline: $('.edit_opp_form .date_deadline').val(),
-			title_action: $('.edit_opp_form .title_action').val(),
-			date_action: $('.edit_opp_form .date_action').val(),
-			priority: $('input[name="PriorityRadioOptions"]:checked').val(),
-		}])
-		.done(function(response){
-			window.location.reload();
-		});
-	return false;
+$('.edit_opp_confirm').on('click',function(){
+    var $btn = this;
+    $btn.prop('disabled', true);
+    new Model('crm.lead')
+        .call("update_lead_portal", [[parseInt($('.edit_opp_form .opportunity_id').val())],{
+            activity_id: parseInt($('.edit_opp_form .next_activity').find(":selected").attr('data')),
+            planned_revenue: parseFloat($('.edit_opp_form .planned_revenue').val()),
+            probability: parseFloat($('.edit_opp_form .probability').val()),
+            date_deadline: $('.edit_opp_form .date_deadline').val(),
+            title_action: $('.edit_opp_form .title_action').val(),
+            date_action: $('.edit_opp_form .date_action').val(),
+            priority: $('input[name="PriorityRadioOptions"]:checked').val(),
+        }])
+        .fail(function() {
+            $btn.prop('disabled', false);
+        })
+        .done(function(){
+            window.location.reload();
+        });
+    return false;
 });
 
-$('.edit_opp_form .next_activity').on('change', function(e){
-	var selected = $('.edit_opp_form .next_activity').find(":selected");
-	if(selected.attr('description')){
-		$('.edit_opp_form .title_action').val(selected.attr('description'));
-	}
-	if(selected.attr('days')){
-		var date_now = moment();
-		var days = parseInt(selected.attr('days'));
-		var date = date_now.add(days, 'days');
-		$('.edit_opp_form .date_action').val(date.format('YYYY-MM-DD'));
-	}
+$('.edit_opp_form .next_activity').on('change', function(){
+    var selected = $('.edit_opp_form .next_activity').find(":selected");
+    if(selected.attr('description')){
+        $('.edit_opp_form .title_action').val(selected.attr('description'));
+    }
+    if(selected.attr('days')){
+        var date_now = moment();
+        var days = parseInt(selected.attr('days'));
+        var date = date_now.add(days, 'days');
+        $('.edit_opp_form .date_action').val(date.format('YYYY-MM-DD'));
+    }
 });
 
 $("div.input-group span.fa-calendar").on('click', function(e) {
-	$(e.currentTarget).closest("div.date").datetimepicker({
-		icons : {
-			time: 'fa fa-clock-o',
-			date: 'fa fa-calendar',
-			up: 'fa fa-chevron-up',
-			down: 'fa fa-chevron-down'
-		},
-	});
+    $(e.currentTarget).closest("div.date").datetimepicker({
+        icons : {
+            time: 'fa fa-clock-o',
+            date: 'fa fa-calendar',
+            up: 'fa fa-chevron-up',
+            down: 'fa fa-chevron-down'
+        },
+    });
 });
 });
\ No newline at end of file