diff --git a/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx b/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
index ae99e40fe..cdf120912 100644
--- a/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
+++ b/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
@@ -39,14 +39,10 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
           <EmployeeSearchSelectComponent
             style={{ minWidth: "100%" }}
             mode="multiple"
+            normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
-            onChange={(value) => {
-              // Filter out null or invalid values before passing to Form
-              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
-              return cleanedValue;
-            }}
           />
         </Form.Item>
       ) : (
diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml
index 9ba3be7e8..77084c96c 100644
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -1157,6 +1157,7 @@
         update:
           columns:
             - shopname
+            - notification_followers
             - md_order_statuses
       retry_conf:
         interval_sec: 10
diff --git a/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js b/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js
index 5f626e3d9..374002a79 100644
--- a/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js
+++ b/server/integrations/partsManagement/endpoints/partsManagementProvisioning.js
@@ -241,6 +241,8 @@ const partsManagementProvisioning = async (req, res) => {
       "phone",
       "userEmail"
     ]);
+
+    // TODO add in check for early access
     await ensureExternalIdUnique(body.external_shop_id);
 
     logger.log("admin-create-shop-user", "debug", body.userEmail, null, {