diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index db2086b07a1..fc4208a1e7e 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -44,7 +44,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                                <button class="btn btn-primary btn-lg o_website_form_send">Send</button>
+                                <span class="btn btn-primary btn-lg o_website_form_send">Send</span>
                                 <span id="o_website_form_result"></span>
                             </div>
                         </div>
diff --git a/addons/website_form/static/src/js/website_form.js b/addons/website_form/static/src/js/website_form.js
index cea891ef135..ad5dcaa5cb7 100644
--- a/addons/website_form/static/src/js/website_form.js
+++ b/addons/website_form/static/src/js/website_form.js
@@ -47,6 +47,7 @@ odoo.define('website_form.animation', function (require) {
 
         send: function(e) {
             e.preventDefault();  // Prevent the default submit behavior
+            this.$target.find('.o_website_form_send').off();  // Prevent users from crazy clicking
 
             var self = this;
 
@@ -211,6 +212,10 @@ odoo.define('website_form.animation', function (require) {
         },
 
         update_status: function(status) {
+            var self = this;
+            if (status != 'success') {  // Restore send button behavior if result is an error
+                this.$target.find('.o_website_form_send').on('click',function(e) {self.send(e);});
+            }
             this.$target.find('#o_website_form_result').replaceWith(qweb.render("website_form.status_" + status))
         },
     });
diff --git a/addons/website_hr_recruitment/views/templates.xml b/addons/website_hr_recruitment/views/templates.xml
index 3ac6736a7e2..38643a7479e 100644
--- a/addons/website_hr_recruitment/views/templates.xml
+++ b/addons/website_hr_recruitment/views/templates.xml
@@ -195,7 +195,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                                <button class="btn btn-primary btn-lg o_website_form_send">Submit</button>
+                                <span class="btn btn-primary btn-lg o_website_form_send">Submit</span>
                                 <span id="o_website_form_result"></span>
                             </div>
                         </div>