diff --git a/client/src/services/suggestion-service.js b/client/src/services/suggestion-service.js
index 58410ae97..ed4678a23 100644
--- a/client/src/services/suggestion-service.js
+++ b/client/src/services/suggestion-service.js
@@ -18,7 +18,11 @@ export const getById = async (id) => {
 };
 
 export const post = async (suggestion) => {
-  const response = await axios.post(baseUrl, { ...suggestion, tenantId });
+  const response = await axios.post(baseUrl, {
+    ...suggestion,
+    stakeholderId: suggestion.stakeholderId || null,
+    tenantId,
+  });
   return response.data;
 };
 
diff --git a/server/app/services/stakeholder-service.js b/server/app/services/stakeholder-service.js
index 1358b8d56..22de04257 100644
--- a/server/app/services/stakeholder-service.js
+++ b/server/app/services/stakeholder-service.js
@@ -679,7 +679,7 @@ const requestAssignment = async (model) => {
     where sh.verification_status_id = 1
     and sh.tenant_id = $<tenantId>
     and c.inactive = false
-    and (ARRAY[1,4] && sh.category_ids)
+    and (ARRAY[1,9] && sh.category_ids)
     order by sh.modified_date
     limit 1
   )