diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php
index bbf65d22b..45e7d3de6 100644
--- a/application/forms/Authentication/LoginForm.php
+++ b/application/forms/Authentication/LoginForm.php
@@ -57,7 +57,8 @@ class LoginForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Login')
+                'ignore'    => true,
+                'label'     => t('Login')
             )
         );
     }
diff --git a/application/forms/Config/Authentication/BaseBackendForm.php b/application/forms/Config/Authentication/BaseBackendForm.php
index cde39d1eb..02aa5dfb4 100644
--- a/application/forms/Config/Authentication/BaseBackendForm.php
+++ b/application/forms/Config/Authentication/BaseBackendForm.php
@@ -20,7 +20,8 @@ abstract class BaseBackendForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -75,9 +76,6 @@ abstract class BaseBackendForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values['force_creation']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
@@ -104,6 +102,7 @@ abstract class BaseBackendForm extends Form
             'force_creation',
             array(
                 'order'     => 0,
+                'ignore'    => true,
                 'label'     => t('Force Changes'),
                 'helptext'  => t('Check this box to enforce changes without connectivity validation')
             )
diff --git a/application/forms/Config/ConfirmRemovalForm.php b/application/forms/Config/ConfirmRemovalForm.php
index 96dea6056..a2a5f3b34 100644
--- a/application/forms/Config/ConfirmRemovalForm.php
+++ b/application/forms/Config/ConfirmRemovalForm.php
@@ -28,7 +28,8 @@ class ConfirmRemovalForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Confirm Removal')
+                'ignore'    => true,
+                'label'     => t('Confirm Removal')
             )
         );
     }
diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php
index 90a4f4ea4..ae06dcb9a 100644
--- a/application/forms/Config/GeneralForm.php
+++ b/application/forms/Config/GeneralForm.php
@@ -46,7 +46,8 @@ class GeneralForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
diff --git a/application/forms/Config/LoggingForm.php b/application/forms/Config/LoggingForm.php
index 475d65fb2..4b212cc2d 100644
--- a/application/forms/Config/LoggingForm.php
+++ b/application/forms/Config/LoggingForm.php
@@ -134,28 +134,14 @@ class LoggingForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save')
+                'ignore'    => true,
+                'label'     => t('Save')
             )
         );
 
         return $this;
     }
 
-    /**
-     * Retrieve all form element values
-     *
-     * Returns all configuration relevant element values.
-     *
-     * @return  array
-     */
-    public function getValues()
-    {
-        $values = parent::getValues();
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
-        return $values;
-    }
-
     /**
      * Return the default logging directory for type "file"
      *
diff --git a/application/forms/Config/ResourceForm.php b/application/forms/Config/ResourceForm.php
index d8a3cc850..a0394e45c 100644
--- a/application/forms/Config/ResourceForm.php
+++ b/application/forms/Config/ResourceForm.php
@@ -83,7 +83,8 @@ class ResourceForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -197,9 +198,6 @@ class ResourceForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values['force_creation']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
@@ -228,6 +226,7 @@ class ResourceForm extends Form
             'force_creation',
             array(
                 'order'     => 0,
+                'ignore'    => true,
                 'label'     => t('Force Changes'),
                 'helptext'  => t('Check this box to enforce changes without connectivity validation')
             )
diff --git a/application/forms/Dashboard/AddUrlForm.php b/application/forms/Dashboard/AddUrlForm.php
index e73fd5067..4a9d93016 100644
--- a/application/forms/Dashboard/AddUrlForm.php
+++ b/application/forms/Dashboard/AddUrlForm.php
@@ -56,8 +56,9 @@ class AddUrlForm extends Form
                     'submit',
                     'use_existing_dashboard',
                     array(
-                        'label' => t('Use An Existing Pane'),
-                        'style' => 'display: inline-block'
+                        'ignore'    => true,
+                        'label'     => t('Use An Existing Pane'),
+                        'style'     => 'display: inline-block'
                     )
                 );
             }
@@ -76,8 +77,9 @@ class AddUrlForm extends Form
                 'submit',
                 'create_new_pane',
                 array(
-                    'label' => t('Create A New Pane'),
-                    'style' => 'display: inline-block'
+                    'ignore'    => true,
+                    'label'     => t('Create A New Pane'),
+                    'style'     => 'display: inline-block'
                 )
             );
         }
@@ -103,7 +105,8 @@ class AddUrlForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Add To Dashboard')
+                'ignore'    => true,
+                'label'     => t('Add To Dashboard')
             )
         );
 
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 6f79ebb34..f16d43342 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -138,7 +138,8 @@ class GeneralForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index 75e66d514..99300bcab 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -216,7 +216,8 @@ class Form extends Zend_Form
                 'hidden',
                 $this->tokenElementName,
                 array(
-                    'value' => $this->generateCsrfToken()
+                    'ignore'    => true,
+                    'value'     => $this->generateCsrfToken()
                 )
             );
         }
diff --git a/modules/monitoring/application/forms/Config/BackendForm.php b/modules/monitoring/application/forms/Config/BackendForm.php
index 19f870778..4b2859432 100644
--- a/modules/monitoring/application/forms/Config/BackendForm.php
+++ b/modules/monitoring/application/forms/Config/BackendForm.php
@@ -74,7 +74,8 @@ class BackendForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -98,8 +99,6 @@ class BackendForm extends Form
         }
 
         unset($values['name']);
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }
 
diff --git a/modules/monitoring/application/forms/Config/InstanceForm.php b/modules/monitoring/application/forms/Config/InstanceForm.php
index 7b74053c9..e74ecca86 100644
--- a/modules/monitoring/application/forms/Config/InstanceForm.php
+++ b/modules/monitoring/application/forms/Config/InstanceForm.php
@@ -33,6 +33,7 @@ class InstanceForm extends Form
                 'type',
                 array(
                     'required'      => true,
+                    'ignore'        => true,
                     'label'         => t('Instance Type'),
                     'class'         => 'autosubmit',
                     'helptext'      => t(
@@ -92,6 +93,7 @@ class InstanceForm extends Form
                 'hitchhiker',
                 array(
                     'required'  => true,
+                    'ignore'    => true,
                     'value'     => 'Arthur'
                 )
             );
@@ -119,7 +121,8 @@ class InstanceForm extends Form
             'submit',
             'btn_submit',
             array(
-                'label' => t('Save Changes')
+                'ignore'    => true,
+                'label'     => t('Save Changes')
             )
         );
 
@@ -138,10 +141,6 @@ class InstanceForm extends Form
         $values = $this->getValues();
         $name = $values['name'];
         unset($values['name']);
-        unset($values['type']);
-        unset($values['hitchhiker']);
-        unset($values['btn_submit']);
-        unset($values[$this->getTokenElementName()]);
         return array($name, $values);
     }