diff --git a/js/apps/system/aardvark/frontend/js/views/applicationsView.js b/js/apps/system/aardvark/frontend/js/views/applicationsView.js
index dd2ed8649d..4c5d061b24 100644
--- a/js/apps/system/aardvark/frontend/js/views/applicationsView.js
+++ b/js/apps/system/aardvark/frontend/js/views/applicationsView.js
@@ -720,8 +720,8 @@
         validateInput: function() {
           return [
             {
-              rule: Joi.string().required().regex(/^[a-zA-Z]+$/),
-              msg: "Can only contain a to z or A to Z."
+              rule: Joi.string().required().regex(/^[a-zA-Z-_][a-zA-Z0-9-_]*$/),
+              msg: "Can only contain a to z, A to Z, 0-9, '-' and '_'."
             }
           ];
         }
@@ -744,7 +744,7 @@
         validateInput: function() {
           return [
             {
-              rule: Joi.string().required().regex(/^[a-zA-Z]+$/),
+              rule: Joi.string().required().regex(/^[a-zA-Z0-9 .,;-]+$/),
               msg: "Has to be non empty."
             }
           ];