diff --git a/module/CommonBundle/Component/Form/Form.php b/module/CommonBundle/Component/Form/Form.php
index 30c2964aa9..b5ab6e0ded 100644
--- a/module/CommonBundle/Component/Form/Form.php
+++ b/module/CommonBundle/Component/Form/Form.php
@@ -239,7 +239,7 @@ protected function createUnitsArray($academic): array
                     ->findAllActiveAndDisplayed()->getResult(),
                 $this->getEntityManager()
                     ->getRepository(Unit::class)
-                    ->findAllActiveAndDisplayedAndWorkgroupQuery()->getResult(),
+                    ->findAllActiveAndDisplayedAndWorkgroupQuery()->getResult()
             );
         }
 
diff --git a/module/LogisticsBundle/Form/Admin/Article/Add.php b/module/LogisticsBundle/Form/Admin/Article/Add.php
index bbaac2f355..5032963b7a 100644
--- a/module/LogisticsBundle/Form/Admin/Article/Add.php
+++ b/module/LogisticsBundle/Form/Admin/Article/Add.php
@@ -66,7 +66,7 @@ public function init()
                 ),
                 'required'   => true,
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
             )
         );
@@ -243,9 +243,10 @@ private function createLocationsArray()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/LogisticsBundle/Form/Admin/Article/Csv.php b/module/LogisticsBundle/Form/Admin/Article/Csv.php
index 9a9b016502..0bf3ea4c8c 100644
--- a/module/LogisticsBundle/Form/Admin/Article/Csv.php
+++ b/module/LogisticsBundle/Form/Admin/Article/Csv.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace LogisticsBundle\Form\Admin\Article;
-
+
 use RuntimeException;
 
 /**
@@ -33,7 +33,7 @@ public function init()
                 ),
                 'required'   => true,
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
             )
         );
@@ -71,9 +71,10 @@ public function init()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
@@ -90,4 +91,4 @@ private function createUnitsArray()
 
         return $unitsArray;
     }
-}
+}
diff --git a/module/LogisticsBundle/Form/Admin/Order/Add.php b/module/LogisticsBundle/Form/Admin/Order/Add.php
index dac86a1ab7..a69f3751aa 100644
--- a/module/LogisticsBundle/Form/Admin/Order/Add.php
+++ b/module/LogisticsBundle/Form/Admin/Order/Add.php
@@ -72,7 +72,7 @@ public function init()
                 'required'   => true,
                 'attributes' => array(
                     'multiple' => true,
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                     'id'      => 'order_review_unit',
                 ),
             )
@@ -254,9 +254,10 @@ private function createLocationsArray()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/ShiftBundle/Form/Admin/RegistrationShift/Add.php b/module/ShiftBundle/Form/Admin/RegistrationShift/Add.php
index 6edb12fecc..c9f1374c01 100644
--- a/module/ShiftBundle/Form/Admin/RegistrationShift/Add.php
+++ b/module/ShiftBundle/Form/Admin/RegistrationShift/Add.php
@@ -221,7 +221,7 @@ public function init()
                 'label'      => 'Unit',
                 'required'   => true,
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
             )
         );
@@ -334,9 +334,10 @@ private function createDuplicatesArray()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/ShiftBundle/Form/Admin/Shift/Add.php b/module/ShiftBundle/Form/Admin/Shift/Add.php
index 0c703dd84c..9068a92a16 100644
--- a/module/ShiftBundle/Form/Admin/Shift/Add.php
+++ b/module/ShiftBundle/Form/Admin/Shift/Add.php
@@ -200,7 +200,7 @@ public function init()
                 'label'      => 'Unit',
                 'required'   => true,
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
             )
         );
@@ -362,9 +362,10 @@ private function createDuplicatesArray()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/ShiftBundle/Form/Admin/Shift/Csv.php b/module/ShiftBundle/Form/Admin/Shift/Csv.php
index 7c029570d0..e958a3fe0d 100644
--- a/module/ShiftBundle/Form/Admin/Shift/Csv.php
+++ b/module/ShiftBundle/Form/Admin/Shift/Csv.php
@@ -74,7 +74,7 @@ public function init()
                 'label'      => 'Unit',
                 'required'   => true,
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
             )
         );
@@ -181,9 +181,10 @@ private function createDuplicatesArray()
     }
 
     /**
+     * @param $academic
      * @return array
      */
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/ShiftBundle/Form/RegistrationShift/Search/Unit.php b/module/ShiftBundle/Form/RegistrationShift/Search/Unit.php
index 7cdeae610c..9c34cd2585 100644
--- a/module/ShiftBundle/Form/RegistrationShift/Search/Unit.php
+++ b/module/ShiftBundle/Form/RegistrationShift/Search/Unit.php
@@ -18,12 +18,13 @@ public function init()
     {
         parent::init();
 
+
         $this->add(
             array(
                 'type'       => 'select',
                 'name'       => 'unit',
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
                 'options'    => array(
                     'input' => array(
@@ -36,7 +37,7 @@ public function init()
         $this->remove('csrf');
     }
 
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')
diff --git a/module/ShiftBundle/Form/Shift/Search/Unit.php b/module/ShiftBundle/Form/Shift/Search/Unit.php
index 639ad01d78..e452bb90bc 100644
--- a/module/ShiftBundle/Form/Shift/Search/Unit.php
+++ b/module/ShiftBundle/Form/Shift/Search/Unit.php
@@ -23,7 +23,7 @@ public function init()
                 'type'       => 'select',
                 'name'       => 'unit',
                 'attributes' => array(
-                    'options' => $this->createUnitsArray(),
+                    'options' => $this->createUnitsArray($academic = null),
                 ),
                 'options'    => array(
                     'input' => array(
@@ -36,7 +36,7 @@ public function init()
         $this->remove('csrf');
     }
 
-    private function createUnitsArray()
+    protected function createUnitsArray($academic): array
     {
         $units = $this->getEntityManager()
             ->getRepository('CommonBundle\Entity\General\Organization\Unit')