diff --git a/src/Squidex/app/features/administration/pages/restore/restore-page.component.html b/src/Squidex/app/features/administration/pages/restore/restore-page.component.html
index 096a355db..6e72c95aa 100644
--- a/src/Squidex/app/features/administration/pages/restore/restore-page.component.html
+++ b/src/Squidex/app/features/administration/pages/restore/restore-page.component.html
@@ -51,10 +51,10 @@
             <form [formGroup]="restoreForm.form" (ngSubmit)="restore()">
                 <div class="row no-gutters">
                     <div class="col">
-                        <input class="form-control" name="url" formControlName="url" placeholder="Url to backup" />
+                        <input class="form-control" formControlName="url" placeholder="Url to backup" />
                     </div>
                     <div class="col pl-1">
-                        <input class="form-control" name="name" formControlName="name" placeholder="Optional app name" />
+                        <input class="form-control" formControlName="name" placeholder="Optional app name" />
                     </div>
                     <div class="col-auto pl-1">
                         <button type="submit" class="btn btn-success" [disabled]="restoreForm.hasNoUrl | async">Restore Backup</button>
diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
index 0a16aea81..cb9048955 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
@@ -18,7 +18,7 @@
                     <div class="row">
                         <div class="col-4 type" *ngFor="let fieldType of fieldTypes">
                             <label>
-                                <input type="radio" class="radio-input" formControlName="type" value="{{fieldType.type}}" name="fieldType" />
+                                <input type="radio" class="radio-input" name="type" formControlName="type" value="{{fieldType.type}}" />
 
                                 <div class="row no-gutters">
                                     <div class="col-auto">
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
index 8ca7245d0..85fa9d555 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
@@ -16,7 +16,7 @@
             <div class="form-group">
                 <div *ngFor="let script of editForm.form.controls | sqxKeys">
                     <ng-container *ngIf="selectedField === script">
-                        <sqx-code-editor name="script" [formControlName]="script"></sqx-code-editor>
+                        <sqx-code-editor [formControlName]="script"></sqx-code-editor>
                     </ng-container>
                 </div>
             </div>
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.html
index d8ef4eee5..875f71ed5 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/boolean-ui.component.html
@@ -26,14 +26,14 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Checkbox'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Checkbox" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Checkbox" />
 
                 <i class="icon-control-Checkbox"></i>
 
                 <span class="radio-label">Checkbox</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Toggle'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Toggle" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Toggle" />
 
                 <i class="icon-control-Toggle"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
index e17bbb936..d89245ed2 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-ui.component.html
@@ -26,14 +26,14 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Date'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Date" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Date" />
 
                 <i class="icon-control-Date"></i>
 
                 <span class="radio-label">Date</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'DateTime'">
-                <input type="radio" class="radio-input" formControlName="editor" value="DateTime" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="DateTime" />
 
                 <i class="icon-control-DateTime"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.html
index 8e7dc779c..0c99136ce 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/geolocation-ui.component.html
@@ -15,7 +15,7 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Map'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Map" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Map" />
 
                 <i class="icon-control-Map"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
index 7491f9d3d..a954b3d20 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.html
@@ -26,28 +26,28 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Input'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Input" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Input" />
 
                 <i class="icon-control-Input"></i>
 
                 <span class="radio-label">Input</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Dropdown'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Dropdown" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Dropdown" />
 
                 <i class="icon-control-Dropdown"></i>
 
                 <span class="radio-label" clas>Dropdown</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Radio'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Radio" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Radio" />
 
                 <i class="icon-control-Radio"></i>
 
                 <span class="radio-label">Radio</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Stars'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Stars" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Stars" />
 
                 <i class="icon-control-Stars"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html
index 0a0cf9697..9090e039c 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html
@@ -26,63 +26,63 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Input'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Input" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Input" />
 
                 <i class="icon-control-Input"></i>
 
                 <span class="radio-label">Input</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Slug'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Slug" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Slug" />
 
                 <i class="icon-control-Slug"></i>
 
                 <span class="radio-label">Slug</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'TextArea'">
-                <input type="radio" class="radio-input" formControlName="editor" value="TextArea" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="TextArea" />
 
                 <i class="icon-control-TextArea"></i>
 
                 <span class="radio-label">TextArea</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'RichText'">
-                <input type="radio" class="radio-input" formControlName="editor" value="RichText" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="RichText" />
 
                 <i class="icon-control-RichText"></i>
 
                 <span class="radio-label">RichText</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Markdown'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Markdown" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Markdown" />
 
                 <i class="icon-control-Markdown"></i>
 
                 <span class="radio-label">Markdown</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Dropdown'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Dropdown" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Dropdown" />
 
                 <i class="icon-control-Dropdown"></i>
 
                 <span class="radio-label" clas>Dropdown</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Radio'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Radio" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Radio" />
 
                 <i class="icon-control-Radio"></i>
 
                 <span class="radio-label">Radio</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Color'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Color" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Color" />
 
                 <i class="icon-control-Color"></i>
 
                 <span class="radio-label">Color</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Html'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Html" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Html" />
 
                 <i class="icon-control-Html"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.html
index 3434fdf30..6a18b7b63 100644
--- a/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/types/tags-ui.component.html
@@ -26,21 +26,21 @@
 
         <div class="col-9">
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Tags'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Tags" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Tags" />
 
                 <i class="icon-control-Tags"></i>
 
                 <span class="radio-label">Tags</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Dropdown'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Dropdown" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Dropdown" />
 
                 <i class="icon-control-Dropdown"></i>
 
                 <span class="radio-label" clas>Dropdown</span>
             </label>
             <label class="btn btn-radio" [class.active]="editForm.controls['editor'].value === 'Checkboxes'">
-                <input type="radio" class="radio-input" formControlName="editor" value="Checkboxes" name="editor" />
+                <input type="radio" class="radio-input" name="editor" formControlName="editor" value="Checkboxes" />
 
                 <i class="icon-control-Checkboxes"></i>
 
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html
index aace70a40..ffa0401b7 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html
+++ b/src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html
@@ -35,7 +35,7 @@
                 <div class="row no-gutters">
                     <div class="col-6 type">
                         <label>
-                            <input type="radio" class="radio-input" formControlName="isSingleton" [value]="false" name="singleton" />
+                            <input type="radio" class="radio-input" name="isSingleton" formControlName="isSingleton" [value]="false" />
                         
                             <div class="row no-gutters">
                                 <div class="col-auto">
@@ -53,7 +53,7 @@
                     </div>
                     <div class="col-6 type">
                         <label>
-                            <input type="radio" class="radio-input" formControlName="isSingleton" [value]="true" name="singleton" />
+                            <input type="radio" class="radio-input" name="isSingleton" formControlName="isSingleton" [value]="true" />
                         
                             <div class="row no-gutters">
                                 <div class="col-auto">
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
index 3fb249b18..a1b82746f 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
@@ -37,7 +37,7 @@
 <ng-container *sqxModalView="addSchemaDialog;onRoot:true">
     <sqx-schema-form [import]="import"
         (cancel)="addSchemaDialog.hide()"
-        (create)="redirectSchema($event)">
+        (complete)="redirectSchema($event)">
     </sqx-schema-form>
 </ng-container>