diff --git a/static/js/settings_account.js b/static/js/settings_account.js
index 29be259265..1414c8a070 100644
--- a/static/js/settings_account.js
+++ b/static/js/settings_account.js
@@ -259,16 +259,27 @@ exports.set_up = function () {
     });
 
     $("#do_deactivate_self_button").on('click',function () {
-        $("#deactivate_self_modal").modal("hide");
-        channel.del({
-            url: '/json/users/me',
-            success: function () {
-                window.location.href = "/login";
-            },
-            error: function (xhr) {
-                ui_report.error(i18n.t("Error deactivating account"), xhr, $('#account-settings-status').expectOne());
-            },
+        $("#do_deactivate_self_button .loader").css('display', 'inline-block');
+        $("#do_deactivate_self_button span").hide();
+        $("#do_deactivate_self_button object").on("load", function () {
+            var doc = this.getSVGDocument();
+            var $svg = $(doc).find("svg");
+            $svg.find("rect").css("fill", "#000");
         });
+
+        setTimeout(function () {
+            channel.del({
+                url: '/json/users/me',
+                success: function () {
+                    $("#deactivate_self_modal").modal("hide");
+                    window.location.href = "/login";
+                },
+                error: function (xhr) {
+                    $("#deactivate_self_modal").modal("hide");
+                    ui_report.error(i18n.t("Error deactivating account"), xhr, $('#account-settings-status').expectOne());
+                },
+            });
+        }, 5000);
     });
 
 
diff --git a/static/styles/settings.css b/static/styles/settings.css
index 6d4e7fce2c..4d1224abc0 100644
--- a/static/styles/settings.css
+++ b/static/styles/settings.css
@@ -1150,6 +1150,15 @@ input[type=checkbox].inline-block {
     border-radius: 0px;
 }
 
+#do_deactivate_self_button .loader {
+    display: none;
+    vertical-align: top;
+    position: relative;
+    height: 30px;
+    margin-top: -10px;
+    top: 5px;
+}
+
 #id_realm_notifications_stream .dropdown-search > input[type=text],
 #id_realm_signup_notifications_stream .dropdown-search > input[type=text] {
     margin: 9px;
diff --git a/static/templates/settings/account-settings.handlebars b/static/templates/settings/account-settings.handlebars
index 3cd3555481..db4d158e77 100644
--- a/static/templates/settings/account-settings.handlebars
+++ b/static/templates/settings/account-settings.handlebars
@@ -158,7 +158,10 @@
             </div>
             <div class="modal-footer">
                 <button class="button" data-dismiss="modal">{{t "Cancel" }}</button>
-                <button class="button btn-danger rounded" id="do_deactivate_self_button">{{t "Deactivate now" }}</button>
+                <button class="button btn-danger rounded" id="do_deactivate_self_button">
+                    <object class="loader" type="image/svg+xml" data="/static/images/loader.svg"></object>
+                    <span>{{t "Deactivate now" }}</span>
+                </button>
             </div>
         </div>