diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/FieldBuilder.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/FieldBuilder.cs
index c95763c9b..2d519d752 100644
--- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/FieldBuilder.cs
+++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/FieldBuilder.cs
@@ -41,7 +41,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates.Builders
 
         public FieldBuilder Localizable()
         {
-            field.Partitioning = Partitioning.Invariant.Key;
+            field.Partitioning = Partitioning.Language.Key;
 
             return this;
         }
diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/StringFieldBuilder.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/StringFieldBuilder.cs
index 15fbdbf46..4a798f72b 100644
--- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/StringFieldBuilder.cs
+++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/StringFieldBuilder.cs
@@ -5,9 +5,9 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================
 
+using System.Collections.Immutable;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Domain.Apps.Entities.Schemas.Commands;
-using System.Collections.Immutable;
 
 namespace Squidex.Domain.Apps.Entities.Apps.Templates.Builders
 {
diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/TagsBuilder.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/TagsFieldBuilder.cs
similarity index 100%
rename from src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/TagsBuilder.cs
rename to src/Squidex.Domain.Apps.Entities/Apps/Templates/Builders/TagsFieldBuilder.cs
diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateIdentityCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateIdentityCommandMiddleware.cs
index 631f4a032..bcdfc7f09 100644
--- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateIdentityCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateIdentityCommandMiddleware.cs
@@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
                 await Task.WhenAll(
                     CreateApiResourcesSchemaAsync(publish),
                     CreateAuthenticationSchemeSchemaAsync(publish),
-                    CreateClientSchemaAsync(publish),
+                    CreateClientsSchemaAsync(publish),
                     CreateIdentityResourcesSchemaAsync(publish),
                     CreateSettingsSchemaAsync(publish),
                     CreateUsersSchemaAsync(publish),
@@ -97,10 +97,10 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
             return NamedId.Of(schema.SchemaId, schema.Name);
         }
 
-        private Task CreateClientSchemaAsync(Func<ICommand, Task> publish)
+        private Task CreateClientsSchemaAsync(Func<ICommand, Task> publish)
         {
             var schema =
-                SchemaBuilder.Create("clients")
+                SchemaBuilder.Create("Clients")
                     .AddString("Client Id", f => f
                         .Required()
                         .Hints("Unique id of the client."))
@@ -208,7 +208,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
                         .Hints("The unique email to login."))
                     .AddString("Phone Number", f => f
                         .Hints("Phone number of the user."))
-                    .AddString("Roles", f => f
+                    .AddTags("Roles", f => f
                         .Hints("The roles of the user."))
                     .AddJson("Claims", f => f
                         .Hints("The claims of the user."))
@@ -225,13 +225,13 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
                         .AsDateTime()
                         .Disabled()
                         .Hints("Indicates when the lockout ends."))
-                    .AddJson("Login", f => f
+                    .AddTags("Login Keys", f => f
                         .Disabled()
                         .Hints("Login information for querying."))
-                    .AddJson("Logins ", f => f
+                    .AddJson("Logins", f => f
                         .Disabled()
                         .Hints("Login information."))
-                    .AddJson("Tokens ", f => f
+                    .AddJson("Tokens", f => f
                         .Disabled()
                         .Hints("Login tokens."))
                     .AddNumber("Access Failed Count", f => f
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs
index 435094d5f..919c2d25e 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs
@@ -33,7 +33,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
                 var contentId = schemaId.Id;
                 var content = new CreateContent { Data = data, ContentId = contentId, SchemaId = schemaId, Publish = true };
 
-                SimpleMapper.Map(context.Command, content);
+                SimpleMapper.Map(createSchema, content);
 
                 await context.CommandBus.PublishAsync(content);
             }
diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs
index 12e65d848..da031af53 100644
--- a/src/Squidex/Config/Domain/EntitiesServices.cs
+++ b/src/Squidex/Config/Domain/EntitiesServices.cs
@@ -176,6 +176,9 @@ namespace Squidex.Config.Domain
             services.AddSingletonAs<CreateBlogCommandMiddleware>()
                 .As<ICommandMiddleware>();
 
+            services.AddSingletonAs<CreateIdentityCommandMiddleware>()
+                .As<ICommandMiddleware>();
+
             services.AddSingletonAs<CreateProfileCommandMiddleware>()
                 .As<ICommandMiddleware>();
         }
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 9ddcbc968..55a237ff0 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
@@ -2,7 +2,7 @@
 
 <sqx-panel theme="light" desiredWidth="70rem">
     <ng-container title>
-        Restore Backup
+        Restore Backup (BETA)
     </ng-container>
 
     <ng-container content>
diff --git a/src/Squidex/app/features/content/shared/field-editor.component.html b/src/Squidex/app/features/content/shared/field-editor.component.html
index b2bb38f56..ba73b6497 100644
--- a/src/Squidex/app/features/content/shared/field-editor.component.html
+++ b/src/Squidex/app/features/content/shared/field-editor.component.html
@@ -3,7 +3,7 @@
     {{field.displayName}} <span class="field-required" [class.hidden]="!field.properties.isRequired">*</span>
 </label> 
 
-<span class="field-disabled" *ngIf="field.isDisabled">Disabled</span>
+<span class="field-disabled pl-1" *ngIf="field.isDisabled">Disabled</span>
 
 <sqx-control-errors [for]="control" [fieldName]="field.displayName" [submitted]="form.submitted | async"></sqx-control-errors>
 
diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.html b/src/Squidex/app/framework/angular/forms/tag-editor.component.html
index 737f2201a..e627f43a8 100644
--- a/src/Squidex/app/framework/angular/forms/tag-editor.component.html
+++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.html
@@ -11,7 +11,7 @@
             [formControl]="addInput"
             [attr.name]="inputName"
             [attr.placeholder]="placeholder"
-            [class.hidden]="addInput.disabled"
+            [disabled]="addInput.disabled"
             autocomplete="off" 
             autocorrect="off"
             autocapitalize="off">
diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.scss b/src/Squidex/app/framework/angular/forms/tag-editor.component.scss
index 3f0000975..dea2b7210 100644
--- a/src/Squidex/app/framework/angular/forms/tag-editor.component.scss
+++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.scss
@@ -12,6 +12,11 @@ $focus-color: #b3d3ff;
         cursor: inherit;
     }
 
+    &.disabled,
+    &:disabled {
+        background: $color-input-disabled;
+    } 
+
     &.focus {
         @include box-shadow-raw(0 0 0 .2rem rgba(51, 137, 255, .25));
         border-color: $focus-color;
diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json
index 6a588f94d..0049e6bd7 100644
--- a/src/Squidex/appsettings.json
+++ b/src/Squidex/appsettings.json
@@ -24,7 +24,7 @@
      */
     "regexSuggestions": {
       // Regex for emails.
-      "Email": "^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\\\.[a-zA-Z0-9-]+)*$",
+      "Email": "^[a-zA-Z0-9.!#$%&’*+\\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:.[a-zA-Z0-9-]+)*$",
       // Regex for phone numbers.
       "Phone": "^\\(*\\+*[1-9]{0,3}\\)*-*[1-9]{0,3}[-. /]*\\(*[2-9]\\d{2}\\)*[-. /]*\\d{3}[-. /]*\\d{4} *e*x*t*\\.* *\\d{0,4}$",
       // Regex for slugs (e.g. hello-world).