diff --git a/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx b/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
index c4789f883..eb19ba3d2 100644
--- a/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
+++ b/Client/src/Pages/Maintenance/CreateMaintenanceWindow/index.jsx
@@ -163,6 +163,7 @@ const CreateNewMaintenanceWindow = () => {
             placeholder="60"
             onChange={(e) => handleChange(e, "duration")}
             value={values.duration}
+            error={errors.duration}
           />
           <Select
             onChange={(e) => handleChange(e, "unit")}
@@ -181,6 +182,7 @@ const CreateNewMaintenanceWindow = () => {
           placeholder="Maintanence at __ : __ for ___ minutes"
           value={values.friendlyName}
           onChange={(e) => handleChange(e, "friendlyName")}
+          error={errors.friendlyName}
         />
       ),
     },
@@ -197,6 +199,7 @@ const CreateNewMaintenanceWindow = () => {
             placeholder="Start typing to search for current monitors"
             value={values.AddMonitors}
             onChange={(e) => handleChange(e, "AddMonitors")}
+            error={errors.addMonitors}
           />
           <Typography
             sx={{
diff --git a/Client/src/Validation/validation.js b/Client/src/Validation/validation.js
index 6719c2c1c..5d53c6728 100644
--- a/Client/src/Validation/validation.js
+++ b/Client/src/Validation/validation.js
@@ -119,6 +119,7 @@ const maintenanceWindowValidation = joi.object({
     "any.required": "Start time is required.",
   }),
   duration: joi.number().required().messages({
+    "number.empty": "duration is required.",
     "number.base": "Duration must be a number.",
     "any.required": "Duration is required.",
   }),
@@ -127,13 +128,13 @@ const maintenanceWindowValidation = joi.object({
     "any.only": "Unit must be one of ['minutes', 'hours', 'days'].",
     "any.required": "Unit is required.",
   }),
-  friendlyName: joi.string().required().max(100).messages({
-    "string.max": "Friendly name must be less than 100 characters.",
-    "any.required": "Friendly name is required.",
+  friendlyName: joi.string().max(50).required().messages({
+    "string.empty": "Friendly name is required.",
+    "string.max": "Friendly name must be less than 50 characters long",
   }),
-  addMonitors: joi.string().required().messages({
-    "string.base": "Add monitors must be a string.",
-    "any.required": "Add monitors is required.",
+  addMonitors: joi.string().max(50).required().messages({
+    "string.empty": "Add monitors is required.",
+    "string.max": "Add monitors must be less than 50 characters long",
   }),
 });