diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 442d77d41b7..8b923a9b825 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -35,9 +35,9 @@
         "usernameJSRegEx" : "^[\\S]{3,30}$",
         "usernameRegExViolationErrorMsg" : "Provided username is invalid.",
         "usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.",
-        "firstnameJSRegEx" : "^[\\S]{3,30}$",
+        "firstnameJSRegEx" : "^.{3,30}$",
         "firstnameRegExViolationErrorMsg" : "Provided first name is invalid.",
-        "lastnameJSRegEx" : "^[\\S]{3,30}$",
+        "lastnameJSRegEx" : "^.{3,30}$",
         "lastnameRegExViolationErrorMsg" : "Provided last name is invalid.",
         "emailJSRegEx" : "/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/",
         "emailRegExViolationErrorMsg" : "Provided email is invalid."
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
index 5544708f938..d105c30ec2c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/register.hbs
@@ -25,14 +25,14 @@
             <div class="form-group">
                 <label for="first_name" class="wr-input-label">First Name</label>
                 <input type="text" id="first_name" name="first_name" class="form-control" placeholder="First Name"
-                       data-regex="{{usernameJSRegEx}}" data-lengthmsg="{{usernameHelpText}}"
-                       data-errormsg="{{usernameRegExViolationErrorMsg}}"/>
+                       data-regex="{{firstnameJSRegEx}}" data-lengthmsg="{{usernameHelpText}}"
+                       data-errormsg="{{firstnameRegExViolationErrorMsg}}"/>
             </div>
 
             <div class="form-group">
                 <label for="last_name" class="wr-input-label">Last Name</label>
                 <input type="text" id="last_name" name="last_name" class="form-control" placeholder="Last Name"
-                       data-regex="{{usernameJSRegEx}}" data-errormsg="{{usernameRegExViolationErrorMsg}}"/>
+                       data-regex="{{lastnameJSRegEx}}" data-errormsg="{{lastnameRegExViolationErrorMsg}}"/>
             </div>
 
             <div class="form-group">