diff --git a/frontend/app/features/settings/settings-area.component.html b/frontend/app/features/settings/settings-area.component.html
index ef96da90a..90627450b 100644
--- a/frontend/app/features/settings/settings-area.component.html
+++ b/frontend/app/features/settings/settings-area.component.html
@@ -59,7 +59,7 @@
                     <i class="icon-subscription"></i> {{ 'common.subscription' | sqxTranslate }}
                 </a>
             </li>
-            <li class="nav-item" *ngIf="app.canReadPlans">
+            <li class="nav-item">
                 <a class="nav-link" routerLink="more" routerLinkActive="active">
                     <i class="icon-settings"></i> {{ 'common.settings' | sqxTranslate }}
                 </a>
diff --git a/frontend/app/shared/state/apps.forms.ts b/frontend/app/shared/state/apps.forms.ts
index 23cf5bae4..3e29a17b7 100644
--- a/frontend/app/shared/state/apps.forms.ts
+++ b/frontend/app/shared/state/apps.forms.ts
@@ -75,7 +75,7 @@ class PatternTemplate {
     public static readonly INSTANCE = new PatternTemplate();
 
     public createControl() {
-        return new FormControl({
+        return new ExtendedFormGroup({
             name: new FormControl('',
                 Validators.required,
             ),
@@ -93,7 +93,7 @@ class EditorTemplate {
     public static readonly INSTANCE = new EditorTemplate();
 
     public createControl() {
-        return new FormControl({
+        return new ExtendedFormGroup({
             name: new FormControl('',
                 Validators.required,
             ),