diff --git a/templates/SharingGroups/add_org.php b/templates/SharingGroups/add_org.php
index f4f11d5..79ce801 100644
--- a/templates/SharingGroups/add_org.php
+++ b/templates/SharingGroups/add_org.php
@@ -13,8 +13,7 @@
             'submit' => [
                 'action' => $this->request->getParam('action')
             ],
-        ],
-        'entity' => null,
+        ]
     ]);
 ?>
 </div>
diff --git a/templates/element/genericElements/Form/genericForm.php b/templates/element/genericElements/Form/genericForm.php
index a0167a6..ed73cf1 100644
--- a/templates/element/genericElements/Form/genericForm.php
+++ b/templates/element/genericElements/Form/genericForm.php
@@ -15,6 +15,7 @@
     $modelForForm = empty($data['model']) ?
         h(\Cake\Utility\Inflector::singularize(\Cake\Utility\Inflector::classify($this->request->getParam('controller')))) :
         h($data['model']);
+    $entity = isset($entity) ? $entity : null;
     $fieldsString = '';
     $simpleFieldWhitelist = [
         'default', 'type', 'placeholder', 'label', 'empty', 'rows', 'div', 'required'