diff --git a/app/views/registrations/new.html.erb b/app/views/registrations/new.html.erb
index 1d6ec1e70..787d9a61c 100644
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -63,7 +63,7 @@
                   <%= invite_hidden_tag(invite) %>
                 </fieldset>
 
-                <%= f.submit t('.continue'), :class => "new-btn" %>
+                <%= f.submit t('.continue'), :class => "new-btn", :disable_with => t('.submitting') %>
             <% end %>
         </div>
     </div>
diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
index 0f8342325..f7a897caa 100644
--- a/app/views/registrations/new.mobile.haml
+++ b/app/views/registrations/new.mobile.haml
@@ -45,7 +45,7 @@
                 = f.password_field :password_confirmation, :placeholder => "••••••••"
 
             .controls
-              = f.submit t('registrations.new.create_my_account'), :class => 'btn primary'
+              = f.submit t('registrations.new.create_my_account'), :class => 'btn primary', :disable_with => t('registrations.new.submitting')
               = link_to t('devise.sessions.new.sign_in'), new_user_session_path(), :class => 'btn primary', :style => "float: right;"
 
 %footer
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 4204c6286..9c28769f4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -894,6 +894,7 @@ en:
       password: "PASSWORD"
       password_confirmation: "PASSWORD CONFIRMATION"
       continue: "Continue"
+      submitting: "Submitting..."
     create:
       success: "You've joined Diaspora!"
     edit: