diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php
index ecb750a7b..b530f3a4a 100644
--- a/library/Icinga/Web/Form.php
+++ b/library/Icinga/Web/Form.php
@@ -297,9 +297,9 @@ abstract class Form extends Zend_Form
      *
      * Enables automatic submission of this form once the user edits specific elements
      *
-     * @param   array $triggerElements The element names which should auto-submit the form
+     * @param   array $triggerElements  The element names which should auto-submit the form
      *
-     * @throws  ProgrammingError When an element is found which does not yet exist
+     * @throws  ProgrammingError        When an element is found which does not yet exist
      */
     final public function enableAutoSubmit($triggerElements)
     {
@@ -355,7 +355,7 @@ abstract class Form extends Zend_Form
      *
      * This method should be used for testing purposes only
      *
-     * @param   bool $disabled
+     * @param   bool $disabled  Set true in order to disable CSRF tokens in this form (default: true), otherwise false
      *
      * @see     tokenDisabled
      */
@@ -388,9 +388,9 @@ abstract class Form extends Zend_Form
     /**
      * Test the submitted data for a correct CSRF token
      *
-     * @param   array $checkData The POST data send by the user
+     * @param   array $checkData            The POST data send by the user
      *
-     * @throws  InvalidCSRFTokenException When CSRF Validation fails
+     * @throws  InvalidCSRFTokenException   When CSRF Validation fails
      */
     final public function assertValidCsrfToken(array $checkData)
     {
diff --git a/modules/monitoring/application/forms/Command/CommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
index 4d09ac6f0..be36ba734 100644
--- a/modules/monitoring/application/forms/Command/CommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -38,6 +38,7 @@ class CommandForm extends Form
 {
     /**
      * Create an instance name containing hidden field
+     *
      * @return Zend_Form_Element_Hidden
      */
     private function createInstanceHiddenField()
@@ -60,7 +61,8 @@ class CommandForm extends Form
 
     /**
      * Get the author name
-
+     *  
+     * @return string
      */
     protected function getAuthorName()
     {
diff --git a/modules/monitoring/application/forms/Command/CustomNotificationForm.php b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
index 44166933f..c4c5fbfd9 100644
--- a/modules/monitoring/application/forms/Command/CustomNotificationForm.php
+++ b/modules/monitoring/application/forms/Command/CustomNotificationForm.php
@@ -99,7 +99,7 @@ class CustomNotificationForm extends CommandForm
     /**
      * Create Custom Notification from request data
      *
-     * @return \Icinga\Protocol\Commandpipe\CustomNotification
+     * @return CustomNotification
      */
     public function getCustomNotification()
     {
diff --git a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
index d5772a8d9..c7b9c6d65 100644
--- a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
+++ b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
@@ -258,8 +258,9 @@ class ScheduleDowntimeForm extends WithChildrenCommandForm
     /**
      * Change validators at runtime
      *
+     * @param array $data   The user provided data that will go into validation
+     *
      * @see Form::preValidation
-     * @param array $data
      */
     protected function preValidation(array $data)
     {
diff --git a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
index fa66f8104..8694c493e 100644
--- a/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
+++ b/modules/monitoring/application/forms/Config/Backend/EditBackendForm.php
@@ -83,7 +83,6 @@ class EditBackendForm extends Form
     /**
      * Set a custom array of resources to be used in this form instead of the ones from DbAdapterFactory
      * (used for testing)
-     *
      */
     public function setResources($resources)
     {