diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index b5fdca3f2..0b5c43b6f 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -12,7 +12,7 @@
     #aspect_name_edit.hidden
       = form_for @aspect, :remote => true do |aspect|
         = aspect.text_field :name, :maxlength => 20
-        = aspect.submit t('.update'), :disable_with => t('.updating'), :class => 'button'
+        = aspect.submit t('.update'), 'data-disable-with' => t('.updating'), :class => 'button'
 
   - if @contacts.count > 0
     = render 'shared/contact_list', :aspect => @aspect, :contacts => @contacts
diff --git a/app/views/comments/_new_comment.mobile.haml b/app/views/comments/_new_comment.mobile.haml
index cf0f1d4a4..97705fb48 100644
--- a/app/views/comments/_new_comment.mobile.haml
+++ b/app/views/comments/_new_comment.mobile.haml
@@ -7,4 +7,4 @@
     .control-group
       = hidden_field_tag :post_id,  post_id, :id => "post_id_on_#{post_id}"
       = text_area_tag :text, nil, :class => "span12 comment_box", :id => "comment_text_on_#{post_id}", :placeholder => t('.comment'), :autofocus => true
-      = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", :disable_with => t('.commenting'), :class => "btn primary"
+      = submit_tag t('.comment'), :id => "comment_submit_#{post_id}", 'data-disable-with' => t('.commenting'), :class => "btn primary"
diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index 50ecf0a28..175e65c54 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -24,4 +24,4 @@
         .bd
           = form_for [conversation, Message.new] do |message|
             = message.text_area :text, :rows => 5, :tabindex => 1
-            = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2
+            = message.submit t('.reply').capitalize, 'data-disable-with' => t('.replying'), :class => 'button creation', :tabindex => 2
diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index dc8f8c239..426fc8ddd 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -50,4 +50,4 @@
       .clearfix
 
       .bottom_submit_section
-        = conversation.submit t('.send'), :disable_with => t('.sending'), :class => 'button creation'
+        = conversation.submit t('.send'), 'data-disable-with' => t('.sending'), :class => 'button creation'
diff --git a/app/views/requests/_new_request_to_person.haml b/app/views/requests/_new_request_to_person.haml
index d95cf9f9a..31a75df78 100644
--- a/app/views/requests/_new_request_to_person.haml
+++ b/app/views/requests/_new_request_to_person.haml
@@ -6,6 +6,6 @@
   = form_for(Request.new, :remote => true ) do |request|
     = request.select(:into, options_from_collection_for_select(aspects, "id", "name"))
     = request.hidden_field :to, :value => destination_handle
-    = request.submit t('people.person.add_contact'), :disable_with => t('requests.create.sending')
+    = request.submit t('people.person.add_contact'), 'data-disable-with' => t('requests.create.sending')
   .message.hidden
     %i= t('.sent')
diff --git a/app/views/requests/_new_request_with_aspect_to_person.haml b/app/views/requests/_new_request_with_aspect_to_person.haml
index 142f0078d..2edeb9f76 100644
--- a/app/views/requests/_new_request_with_aspect_to_person.haml
+++ b/app/views/requests/_new_request_with_aspect_to_person.haml
@@ -6,6 +6,6 @@
   = form_for Request.new, :remote => true do |request|
     = request.hidden_field :into, :value => "changeme"
     = request.hidden_field :to, :value => destination_handle
-    = request.submit '+', :class => 'add', :disable_with => t('requests.create.sending')
+    = request.submit '+', :class => 'add', 'data-disable-with' => t('requests.create.sending')
   .message.hidden
     %i= t('requests.new_request_to_person.sent')