diff --git a/Changelog.md b/Changelog.md
index d432aee95..7fed9a204 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -58,6 +58,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Hide cancel button in publisher on small screens [#6435](https://github.com/diaspora/diaspora/pull/6435)
 * Replace mobile background with color [#6415](https://github.com/diaspora/diaspora/pull/6415)
 * Port flash messages to backbone [#6395](https://github.com/diaspora/diaspora/6395)
+* Change login/registration/forgot password button color [#6504](https://github.com/diaspora/diaspora/pull/6504)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)
diff --git a/app/views/devise/passwords/edit.haml b/app/views/devise/passwords/edit.haml
index 16a5a38d4..126ae62f4 100644
--- a/app/views/devise/passwords/edit.haml
+++ b/app/views/devise/passwords/edit.haml
@@ -38,7 +38,7 @@
                            aria:           {labelledby: "passwordConfirmationLabel"}
 
       = hidden_field(:user, :remember_me, value: 1)
-      = f.submit t('devise.passwords.edit.change_password'), class: "btn btn-block btn-default"
+      = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-block btn-primary"
 
     .text-center
-      = link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
+      = link_to t("devise.shared.links.sign_in"), new_session_path(resource_name)
diff --git a/app/views/devise/passwords/edit.mobile.haml b/app/views/devise/passwords/edit.mobile.haml
index 6b96290f8..2ac3ff92a 100644
--- a/app/views/devise/passwords/edit.mobile.haml
+++ b/app/views/devise/passwords/edit.mobile.haml
@@ -10,20 +10,20 @@
         = f.hidden_field :reset_password_token
         %fieldset
           %legend
-            =t('devise.passwords.edit.change_password')
+            = t("devise.passwords.edit.change_password")
 
           .control-group
-            = f.label :password, t('devise.passwords.edit.new_password'), class: "control-label"
+            = f.label :password, t("devise.passwords.edit.new_password"), class: "control-label"
             .controls
               = f.password_field :password
 
           .control-group
-            = f.label :password_confirmation, t('devise.passwords.edit.confirm_password'), class: "control-label"
+            = f.label :password_confirmation, t("devise.passwords.edit.confirm_password"), class: "control-label"
             .controls
               = f.password_field :password_confirmation
 
           .controls
-            = f.submit t('devise.passwords.edit.change_password'), :class: 'btn btn-primary'
+            = f.submit t("devise.passwords.edit.change_password"), class: "btn btn-primary"
 
 %footer
-  = link_to t('layouts.application.toggle'), toggle_mobile_path
+  = link_to t("layouts.application.toggle"), toggle_mobile_path
diff --git a/app/views/devise/passwords/new.haml b/app/views/devise/passwords/new.haml
index 0dd942247..eccb259a2 100644
--- a/app/views/devise/passwords/new.haml
+++ b/app/views/devise/passwords/new.haml
@@ -26,7 +26,7 @@
                        autofocus:      true,
                        aria:           {labelledby: "passwordLabel"}
 
-      = f.submit t('devise.passwords.new.send_password_instructions'), class: "btn btn-block btn-default"
+      = f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-block btn-primary"
 
     .text-center
       = link_to t('devise.shared.links.sign_in'), new_session_path(resource_name)
diff --git a/app/views/devise/passwords/new.mobile.haml b/app/views/devise/passwords/new.mobile.haml
index dee951b4e..241a1d70c 100644
--- a/app/views/devise/passwords/new.mobile.haml
+++ b/app/views/devise/passwords/new.mobile.haml
@@ -18,10 +18,10 @@
               = f.text_field :email
 
           .controls
-            = f.submit t('devise.passwords.new.send_password_instructions'), :class => 'btn'
+            = f.submit t("devise.passwords.new.send_password_instructions"), class: "btn btn-primary"
 
 %footer
-  - if display_registration_link?    
+  - if display_registration_link?
     = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
 
   = link_to t('devise.sessions.new.sign_in'), new_user_session_path()
diff --git a/app/views/registrations/_form.haml b/app/views/registrations/_form.haml
index 06c9b9099..edd260341 100644
--- a/app/views/registrations/_form.haml
+++ b/app/views/registrations/_form.haml
@@ -57,4 +57,5 @@
     %p.terms.text-center#terms
       = t('registrations.new.terms', terms_link: link_to(t('registrations.new.terms_link'), terms_path, target: "_blank")).html_safe
 
-  = f.submit t('registrations.new.sign_up'), class: "btn btn-block btn-large btn-default", data: {disable_with: t('registrations.new.submitting')}
+  = f.submit t("registrations.new.sign_up"), class: "btn btn-block btn-large btn-primary",
+    data: {disable_with: t("registrations.new.submitting")}
diff --git a/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index e2f8e9019..32e9f53b3 100644
--- a/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
@@ -34,7 +34,7 @@
                          aria: {labelledby: "passwordLabel"}
 
     = f.hidden_field :remember_me, value: 1
-    = f.submit t('devise.sessions.new.sign_in'), class: 'btn btn-large btn-block btn-default'
+    = f.submit t("devise.sessions.new.sign_in"), class: "btn btn-large btn-block btn-primary"
 
   .text-center
     - if display_password_reset_link?