diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index b7c16bc83f..3be4d80fa9 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -87,11 +87,13 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           name: 'name',
           validators: {
             required: null,
-            pattern: '^[^. ,_]{1,32}$',
+            pattern: '^[^. ,]*$',
+            maxLength: 32,
           },
           required: true,
           errorMessages: {
-            pattern: 'error.validation.metadata.namespace.invalid-pattern',
+            pattern: 'error.validation.metadata.name.invalid-pattern',
+            maxLength: 'error.validation.metadata.name.max-length',
           },
         });
       this.namespace = new DynamicInputModel({
@@ -100,8 +102,12 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           name: 'namespace',
           validators: {
             required: null,
+            maxLength: 256,
           },
           required: true,
+          errorMessages: {
+            maxLength: 'error.validation.metadata.namespace.max-length',
+          },
         });
       this.formModel = [
         new DynamicFormGroupModel(
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 55950a8773..df8373e8d2 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -109,11 +109,13 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
         name: 'element',
         validators: {
           required: null,
-          pattern: '^[^.]*$',
+          pattern: '^[^. ,]*$',
+          maxLength: 64,
         },
         required: true,
         errorMessages: {
           pattern: 'error.validation.metadata.element.invalid-pattern',
+          maxLength: 'error.validation.metadata.element.max-length',
         },
       });
       this.qualifier = new DynamicInputModel({
@@ -121,11 +123,13 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
         label: qualifier,
         name: 'qualifier',
         validators: {
-          pattern: '^[^.]*$',
+          pattern: '^[^. ,]*$',
+          maxLength: 64,
         },
         required: false,
         errorMessages: {
           pattern: 'error.validation.metadata.qualifier.invalid-pattern',
+          maxLength: 'error.validation.metadata.qualifier.max-length',
         },
       });
       this.scopeNote = new DynamicInputModel({
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index c0edb83a3b..55c788ffac 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1478,12 +1478,19 @@
 
   "error.validation.groupExists": "This group already exists",
 
-  "error.validation.metadata.namespace.invalid-pattern": "This field cannot contain dots, please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
 
-  "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, please use the Qualifier field instead",
+  "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
 
-  "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots",
+  "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
 
+  "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+
+  "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+
+  "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+
+  "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
 
   "feed.description": "Syndication feed",