diff --git a/app/src/auth/authenticate/strategies/PasswordStrategy.ts b/app/src/auth/authenticate/strategies/PasswordStrategy.ts
index 49880c77..a3c61611 100644
--- a/app/src/auth/authenticate/strategies/PasswordStrategy.ts
+++ b/app/src/auth/authenticate/strategies/PasswordStrategy.ts
@@ -33,7 +33,7 @@ export class PasswordStrategy extends Strategy<typeof schema> {
    private getPayloadSchema() {
       return s.object({
          email: s.string({
-            pattern: /^[\w-\.\+_]+@([\w-]+\.)+[\w-]{2,4}$/,
+            format: "email",
          }),
          password: s.string({
             minLength: 8, // @todo: this should be configurable
diff --git a/app/src/ui/components/form/json-schema/JsonvTsValidator.ts b/app/src/ui/components/form/json-schema/JsonvTsValidator.ts
index a3f8b53f..ae744fd8 100644
--- a/app/src/ui/components/form/json-schema/JsonvTsValidator.ts
+++ b/app/src/ui/components/form/json-schema/JsonvTsValidator.ts
@@ -23,7 +23,7 @@ export class JsonvTsValidator<T = any, S extends StrictRJSFSchema = RJSFSchema>
          return { errors: [], validationError: null as any };
       }
 
-      const jsSchema = s.fromSchema(schema as any);
+      const jsSchema = s.fromSchema(JSON.parse(JSON.stringify(schema)) as any);
       const result = jsSchema.validate(formData);
 
       if (result.valid) {
diff --git a/app/src/ui/modals/debug/SchemaFormModal.tsx b/app/src/ui/modals/debug/SchemaFormModal.tsx
index 5a64e8b5..dc8eece0 100644
--- a/app/src/ui/modals/debug/SchemaFormModal.tsx
+++ b/app/src/ui/modals/debug/SchemaFormModal.tsx
@@ -65,7 +65,7 @@ export function SchemaFormModal({
             <JsonSchemaForm
                tagName="form"
                ref={formRef}
-               schema={schema}
+               schema={JSON.parse(JSON.stringify(schema))}
                uiSchema={uiSchema}
                className="legacy hide-required-mark fieldset-alternative mute-root"
                onChange={handleChange}
diff --git a/app/src/ui/routes/auth/auth.roles.tsx b/app/src/ui/routes/auth/auth.roles.tsx
index 89ac00b4..711a90b5 100644
--- a/app/src/ui/routes/auth/auth.roles.tsx
+++ b/app/src/ui/routes/auth/auth.roles.tsx
@@ -6,7 +6,7 @@ import { Button } from "../../components/buttons/Button";
 import { CellValue, DataTable } from "../../components/table/DataTable";
 import * as AppShell from "../../layouts/AppShell/AppShell";
 import { routes, useNavigate } from "../../lib/routes";
-import { stringIdentifier } from "bknd/core";
+import { s, stringIdentifier } from "bknd/core";
 
 export function AuthRolesList() {
    const [navigate] = useNavigate();
@@ -29,13 +29,9 @@ export function AuthRolesList() {
       bkndModals.open(
          "form",
          {
-            schema: {
-               type: "object",
-               properties: {
-                  name: stringIdentifier,
-               },
-               required: ["name"],
-            },
+            schema: s.strictObject({
+               name: stringIdentifier,
+            }),
             uiSchema: {
                name: {
                   "ui:title": "Role name",