diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js
index b1e7e9e22..b1a8027bb 100644
--- a/public/js/icinga/events.js
+++ b/public/js/icinga/events.js
@@ -222,25 +222,19 @@
         },
 
         autoSubmitForm: function (event) {
-            return event.data.self.submitForm(event, true);
+            return event.data.self.submitForm(event, $(event.currentTarget));
         },
 
         /**
          *
          */
-        submitForm: function (event, autosubmit) {
+        submitForm: function (event, $autoSubmittedBy) {
             var _this   = event.data.self;
-            var icinga = _this.icinga;
+
             // .closest is not required unless subelements to trigger this
             var $form = $(event.currentTarget).closest('form');
-            var url = $form.attr('action');
-            var method = $form.attr('method');
-            var encoding = $form.attr('enctype');
-            var $button = $('input[type=submit]:focus', $form).add('button[type=submit]:focus', $form);
-            var progressTimer;
-            var $target;
-            var data;
 
+            var $button;
             var $rememberedSubmittButton = $form.data('submitButton');
             if (typeof $rememberedSubmittButton != 'undefined') {
                 if ($form.has($rememberedSubmittButton)) {
@@ -253,151 +247,28 @@
                 return true;
             }
 
-            if ($button.length === 0) {
+            if (typeof $button === 'undefined') {
                 var $el;
 
                 if (typeof event.originalEvent !== 'undefined'
                     && typeof event.originalEvent.explicitOriginalTarget === 'object') { // Firefox
                     $el = $(event.originalEvent.explicitOriginalTarget);
-                    icinga.logger.debug('events/submitForm: Button is event.originalEvent.explicitOriginalTarget');
+                    _this.icinga.logger.debug('events/submitForm: Button is event.originalEvent.explicitOriginalTarget');
                 } else {
                     $el = $(event.currentTarget);
-                    icinga.logger.debug('events/submitForm: Button is event.currentTarget');
+                    _this.icinga.logger.debug('events/submitForm: Button is event.currentTarget');
                 }
 
                 if ($el && ($el.is('input[type=submit]') || $el.is('button[type=submit]'))) {
                     $button = $el;
                 } else {
-                    icinga.logger.debug(
+                    _this.icinga.logger.debug(
                         'events/submitForm: Can not determine submit button, using the first one in form'
                     );
                 }
             }
 
-            if (typeof method === 'undefined') {
-                method = 'POST';
-            } else {
-                method = method.toUpperCase();
-            }
-
-            if (typeof encoding === 'undefined') {
-                encoding = 'application/x-www-form-urlencoded';
-            }
-
-            if (typeof autosubmit === 'undefined') {
-                autosubmit = false;
-            }
-
-            if ($button.length === 0) {
-                $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first();
-            }
-
-            if ($button.length) {
-                // Activate spinner
-                if ($button.hasClass('spinner')) {
-                    $button.addClass('active');
-                }
-
-                $target = icinga.loader.getLinkTargetFor($button);
-            } else {
-                $target = icinga.loader.getLinkTargetFor($form);
-            }
-
-            if (! url) {
-                // Use the URL of the target container if the form's action is not set
-                url = $target.closest('.container').data('icinga-url');
-            }
-
-            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
-
-            if (method === 'GET') {
-                var dataObj = $form.serializeObject();
-
-                if (! autosubmit) {
-                    if ($button.length && $button.attr('name') !== 'undefined') {
-                        dataObj[$button.attr('name')] = $button.attr('value');
-                    }
-                }
-
-                url = icinga.utils.addUrlParams(url, dataObj);
-            } else {
-                if (encoding === 'multipart/form-data') {
-                    data = new window.FormData($form[0]);
-                } else {
-                    data = $form.serializeArray();
-                }
-
-                if (! autosubmit) {
-                    if ($button.length && $button.attr('name') !== 'undefined') {
-                        if (encoding === 'multipart/form-data') {
-                            data.append($button.attr('name'), $button.attr('value'));
-                        } else {
-                            data.push({
-                                name: $button.attr('name'),
-                                value: $button.attr('value')
-                            });
-                        }
-                    }
-                }
-            }
-
-            // Disable all form controls to prevent resubmission except for our search input
-            // Note that disabled form inputs will not be enabled via JavaScript again
-            if ($target.attr('id') === $form.closest('.container').attr('id')) {
-                $form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
-            }
-
-            // Show a spinner depending on how the form is being submitted
-            if (autosubmit && typeof $el !== 'undefined' && $el.siblings('.spinner').length) {
-                $el.siblings('.spinner').first().addClass('active');
-            } else if ($button.length && $button.is('button') && $button.hasClass('animated')) {
-                $button.addClass('active');
-            } else if ($button.length && $button.attr('data-progress-label')) {
-                var isInput = $button.is('input');
-                if (isInput) {
-                    $button.prop('value', $button.attr('data-progress-label') + '...');
-                } else {
-                    $button.html($button.attr('data-progress-label') + '...');
-                }
-
-                // Use a fixed width to prevent the button from wobbling
-                $button.css('width', $button.css('width'));
-
-                progressTimer = icinga.timer.register(function () {
-                    var label = isInput ? $button.prop('value') : $button.html();
-                    var dots = label.substr(-3);
-
-                    // Using empty spaces here to prevent centered labels from wobbling
-                    if (dots === '...') {
-                        label = label.slice(0, -2) + '  ';
-                    } else if (dots === '.. ') {
-                        label = label.slice(0, -1) + '.';
-                    } else if (dots === '.  ') {
-                        label = label.slice(0, -2) + '. ';
-                    }
-
-                    if (isInput) {
-                        $button.prop('value', label);
-                    } else {
-                        $button.html(label);
-                    }
-                }, null, 100);
-            } else if ($button.length && $button.next().hasClass('spinner')) {
-                $('i', $button.next()).addClass('active');
-            } else if ($form.attr('data-progress-element')) {
-                var $progressElement = $('#' + $form.attr('data-progress-element'));
-                if ($progressElement.length) {
-                    if ($progressElement.hasClass('spinner')) {
-                        $('i', $progressElement).addClass('active');
-                    } else {
-                        $('i.spinner', $progressElement).addClass('active');
-                    }
-                }
-            }
-
-            var req = icinga.loader.loadUrl(url, $target, data, method);
-            req.forceFocus = autosubmit ? $(event.currentTarget) : $button.length ? $button : null;
-            req.progressTimer = progressTimer;
+            _this.icinga.loader.submitForm($form, $autoSubmittedBy, $button);
 
             event.stopPropagation();
             event.preventDefault();
diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js
index abd7cc9c7..a5502a5bc 100644
--- a/public/js/icinga/loader.js
+++ b/public/js/icinga/loader.js
@@ -47,6 +47,146 @@
             this.icinga.timer.register(this.autorefresh, this, 500);
         },
 
+        submitForm: function ($form, $autoSubmittedBy, $button) {
+            var icinga = this.icinga;
+            var url = $form.attr('action');
+            var method = $form.attr('method');
+            var encoding = $form.attr('enctype');
+            var progressTimer;
+            var $target;
+            var data;
+
+            if (typeof method === 'undefined') {
+                method = 'POST';
+            } else {
+                method = method.toUpperCase();
+            }
+
+            if (typeof encoding === 'undefined') {
+                encoding = 'application/x-www-form-urlencoded';
+            }
+
+            if (typeof $autoSubmittedBy === 'undefined') {
+                $autoSubmittedBy = false;
+            }
+
+            if (typeof $button === 'undefined') {
+                $button = $('input[type=submit]:focus', $form).add('button[type=submit]:focus', $form);
+            }
+
+            if ($button.length === 0) {
+                $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first();
+            }
+
+            if ($button.length) {
+                // Activate spinner
+                if ($button.hasClass('spinner')) {
+                    $button.addClass('active');
+                }
+
+                $target = this.getLinkTargetFor($button);
+            } else {
+                $target = this.getLinkTargetFor($form);
+            }
+
+            if (! url) {
+                // Use the URL of the target container if the form's action is not set
+                url = $target.closest('.container').data('icinga-url');
+            }
+
+            icinga.logger.debug('Submitting form: ' + method + ' ' + url, method);
+
+            if (method === 'GET') {
+                var dataObj = $form.serializeObject();
+
+                if (! $autoSubmittedBy) {
+                    if ($button.length && $button.attr('name') !== 'undefined') {
+                        dataObj[$button.attr('name')] = $button.attr('value');
+                    }
+                }
+
+                url = icinga.utils.addUrlParams(url, dataObj);
+            } else {
+                if (encoding === 'multipart/form-data') {
+                    data = new window.FormData($form[0]);
+                } else {
+                    data = $form.serializeArray();
+                }
+
+                if (! $autoSubmittedBy) {
+                    if ($button.length && $button.attr('name') !== 'undefined') {
+                        if (encoding === 'multipart/form-data') {
+                            data.append($button.attr('name'), $button.attr('value'));
+                        } else {
+                            data.push({
+                                name: $button.attr('name'),
+                                value: $button.attr('value')
+                            });
+                        }
+                    }
+                }
+            }
+
+            // Disable all form controls to prevent resubmission except for our search input
+            // Note that disabled form inputs will not be enabled via JavaScript again
+            if ($target.attr('id') === $form.closest('.container').attr('id')) {
+                $form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
+            }
+
+            // Show a spinner depending on how the form is being submitted
+            if ($autoSubmittedBy && $autoSubmittedBy.siblings('.spinner').length) {
+                $autoSubmittedBy.siblings('.spinner').first().addClass('active');
+            } else if ($button.length && $button.is('button') && $button.hasClass('animated')) {
+                $button.addClass('active');
+            } else if ($button.length && $button.attr('data-progress-label')) {
+                var isInput = $button.is('input');
+                if (isInput) {
+                    $button.prop('value', $button.attr('data-progress-label') + '...');
+                } else {
+                    $button.html($button.attr('data-progress-label') + '...');
+                }
+
+                // Use a fixed width to prevent the button from wobbling
+                $button.css('width', $button.css('width'));
+
+                progressTimer = icinga.timer.register(function () {
+                    var label = isInput ? $button.prop('value') : $button.html();
+                    var dots = label.substr(-3);
+
+                    // Using empty spaces here to prevent centered labels from wobbling
+                    if (dots === '...') {
+                        label = label.slice(0, -2) + '  ';
+                    } else if (dots === '.. ') {
+                        label = label.slice(0, -1) + '.';
+                    } else if (dots === '.  ') {
+                        label = label.slice(0, -2) + '. ';
+                    }
+
+                    if (isInput) {
+                        $button.prop('value', label);
+                    } else {
+                        $button.html(label);
+                    }
+                }, null, 100);
+            } else if ($button.length && $button.next().hasClass('spinner')) {
+                $('i', $button.next()).addClass('active');
+            } else if ($form.attr('data-progress-element')) {
+                var $progressElement = $('#' + $form.attr('data-progress-element'));
+                if ($progressElement.length) {
+                    if ($progressElement.hasClass('spinner')) {
+                        $('i', $progressElement).addClass('active');
+                    } else {
+                        $('i.spinner', $progressElement).addClass('active');
+                    }
+                }
+            }
+
+            var req = this.loadUrl(url, $target, data, method);
+            req.forceFocus = $autoSubmittedBy ? $autoSubmittedBy : $button.length ? $button : null;
+            req.progressTimer = progressTimer;
+            return req;
+        },
+
         /**
          * Load the given URL to the given target
          *