diff --git a/modules/ggroup/src/Plugin/GroupContentEnabler/Subgroup.php b/modules/ggroup/src/Plugin/GroupContentEnabler/Subgroup.php
index fb731d7..8cceef6 100644
--- a/modules/ggroup/src/Plugin/GroupContentEnabler/Subgroup.php
+++ b/modules/ggroup/src/Plugin/GroupContentEnabler/Subgroup.php
@@ -17,6 +17,7 @@ use Symfony\Component\Routing\Route;
  *   label = @Translation("Subgroup"),
  *   description = @Translation("Adds groups to groups."),
  *   entity_type_id = "group",
+ *   entity_access = TRUE,
  *   pretty_path_key = "group",
  *   deriver = "Drupal\ggroup\Plugin\GroupContentEnabler\SubgroupDeriver"
  * )
@@ -68,29 +69,29 @@ class Subgroup extends GroupContentEnablerBase {
       'description_args' => $type_arg,
     ];
 
-    $permissions["view $plugin_id content"] = [
+    $permissions["view $plugin_id entity"] = [
       'title' => '%group_type: View subgroups',
     ] + $defaults;
 
-    $permissions["create $plugin_id content"] = [
+    $permissions["create $plugin_id entity"] = [
       'title' => '%group_type: Create new subgroups',
       'description' => 'Allows you to create %group_type subgroups that immediately belong to this group.',
       'description_args' => $type_arg,
     ] + $defaults;
 
-    $permissions["edit own $plugin_id content"] = [
+    $permissions["update own $plugin_id entity"] = [
       'title' => '%group_type: Edit own subgroups',
     ] + $defaults;
 
-    $permissions["edit any $plugin_id content"] = [
+    $permissions["update any $plugin_id entity"] = [
       'title' => '%group_type: Edit any subgroup',
     ] + $defaults;
 
-    $permissions["delete own $plugin_id content"] = [
+    $permissions["delete own $plugin_id entity"] = [
       'title' => '%group_type: Delete own subgroups',
     ] + $defaults;
 
-    $permissions["delete any $plugin_id content"] = [
+    $permissions["delete any $plugin_id entity"] = [
       'title' => '%group_type: Delete any subgroup',
     ] + $defaults;
 
diff --git a/modules/ggroup/src/Routing/SubgroupRouteProvider.php b/modules/ggroup/src/Routing/SubgroupRouteProvider.php
index ea00bf4..66eddd7 100644
--- a/modules/ggroup/src/Routing/SubgroupRouteProvider.php
+++ b/modules/ggroup/src/Routing/SubgroupRouteProvider.php
@@ -47,6 +47,7 @@ class SubgroupRouteProvider {
       ->setDefaults([
         '_title' => 'Create subgroup',
         '_controller' => '\Drupal\ggroup\Controller\SubgroupWizardController::addPage',
+        'create_mode' => TRUE,
       ])
       ->setRequirement('_group_permission', implode('+', $permissions_create))
       ->setRequirement('_group_installed_content', implode('+', $plugin_ids))