diff --git a/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs b/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs
index f3c1b861d..60613f7ca 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs
+++ b/backend/src/Squidex/Areas/IdentityServer/Config/IdentityServerServices.cs
@@ -20,6 +20,7 @@ using Squidex.Hosting;
 using Squidex.Web;
 using Squidex.Web.Pipeline;
 using static OpenIddict.Abstractions.OpenIddictConstants;
+using static OpenIddict.Server.AspNetCore.OpenIddictServerAspNetCoreHandlers;
 using static OpenIddict.Server.OpenIddictServerEvents;
 using static OpenIddict.Server.OpenIddictServerHandlers;
 
@@ -80,6 +81,8 @@ namespace Squidex.Areas.IdentityServer.Config
                 })
                 .AddServer(builder =>
                 {
+                    builder.RemoveEventHandler(ValidateTransportSecurityRequirement.Descriptor);
+
                     builder.AddEventHandler<ProcessSignInContext>(builder =>
                     {
                         builder.UseSingletonHandler<AlwaysAddTokenHandler>()
diff --git a/backend/src/Squidex/Areas/IdentityServer/Startup.cs b/backend/src/Squidex/Areas/IdentityServer/Startup.cs
index 2b452789a..978972b6b 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Startup.cs
+++ b/backend/src/Squidex/Areas/IdentityServer/Startup.cs
@@ -30,14 +30,6 @@ namespace Squidex.Areas.IdentityServer
                     identityApp.UseExceptionHandler("/error");
                 }
 
-                identityApp.Use((context, next) =>
-                {
-                    // OpenId dict core only works with https, which sucks in our tests.
-                    context.Request.IsHttps = true;
-
-                    return next();
-                });
-
                 identityApp.UseRouting();
 
                 identityApp.UseAuthentication();
diff --git a/frontend/app/shared/components/schema-category.component.html b/frontend/app/shared/components/schema-category.component.html
index 67d86a2f9..6eb7c6616 100644
--- a/frontend/app/shared/components/schema-category.component.html
+++ b/frontend/app/shared/components/schema-category.component.html
@@ -21,7 +21,7 @@
                     ({{filteredSchemas.length}})
                 </ng-container>
                 <ng-template #noSchemas>
-                    <button type="button" class="btn btn-sm btn-text-secondary btn-remove" (click)="remove.emit()">
+                    <button type="button" class="btn btn-sm btn-text-secondary btn-remove" (click)="remove.emit()" *ngIf="schemaCategory.name">
                         <i class="icon-bin2"></i> 
                     </button>
                 </ng-template>
diff --git a/frontend/app/theme/_bootstrap.scss b/frontend/app/theme/_bootstrap.scss
index 69105e321..7bfd91009 100644
--- a/frontend/app/theme/_bootstrap.scss
+++ b/frontend/app/theme/_bootstrap.scss
@@ -573,6 +573,10 @@ a {
             @include build-text-button($color-theme-orange);
         }
     }
+
+    &-outline-secondary {
+        color: $color-text-decent;
+    }
 }
 
 $icon-size: 4.5rem;