diff --git a/src/services/JobCandidateService.js b/src/services/JobCandidateService.js
index 1f283512..d25b2375 100644
--- a/src/services/JobCandidateService.js
+++ b/src/services/JobCandidateService.js
@@ -195,18 +195,22 @@ async function fullyUpdateJobCandidate (currentUser, id, data) {
   return updateJobCandidate(currentUser, id, data)
 }
 
-fullyUpdateJobCandidate.schema = Joi.object().keys({
-  currentUser: Joi.object().required(),
-  id: Joi.string().uuid().required(),
-  data: Joi.object().keys({
-    jobId: Joi.string().uuid().required(),
-    userId: Joi.string().uuid().required(),
-    status: Joi.jobCandidateStatus().default('open'),
-    externalId: Joi.string().allow(null).default(null),
-    resume: Joi.string().uri().allow('').allow(null).default(null),
-    remark: Joi.string().allow('').allow(null).default(null)
-  }).required()
-}).required()
+fullyUpdateJobCandidate.schema = Joi.object()
+  .keys({
+    currentUser: Joi.object().required(),
+    id: Joi.string().uuid().required(),
+    data: Joi.object()
+      .keys({
+        jobId: Joi.string().uuid().required(),
+        userId: Joi.string().uuid().required(),
+        status: Joi.jobCandidateStatus().default("open"),
+        externalId: Joi.string().allow(null).default(null),
+        resume: Joi.string().uri().allow("").allow(null).default(null),
+        remark: Joi.stringAllowEmpty().allow(null),
+      })
+      .required(),
+  })
+  .required();
 
 /**
  * Delete jobCandidate by id
diff --git a/src/services/JobService.js b/src/services/JobService.js
index 06e3b67c..02636480 100644
--- a/src/services/JobService.js
+++ b/src/services/JobService.js
@@ -208,9 +208,9 @@ createJob.schema = Joi.object()
         minSalary: Joi.number().integer().allow(null),
         maxSalary: Joi.number().integer().allow(null),
         hoursPerWeek: Joi.number().integer().allow(null),
-        jobLocation: Joi.string().allow(null).allow(''),
-        jobTimezone: Joi.string().allow(null).allow(''),
-        currency: Joi.string().allow(null).allow(''),
+        jobLocation: Joi.stringAllowEmpty().allow(null),
+        jobTimezone: Joi.stringAllowEmpty().allow(null),
+        currency: Joi.stringAllowEmpty().allow(null),
         roleIds: Joi.array().items(Joi.string().uuid().required())
       })
       .required()