diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index 814e81254..858dd4563 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -94,7 +94,7 @@ export function PartsOrderModalComponent({
             </Space>
           </Tag>
         )}
-        {!isReturn && (
+        {!isReturn && !isPartsEntry && (
           <Form.Item
             name="removefrompartsqueue"
             label={t("parts_orders.labels.removefrompartsqueue")}
diff --git a/server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js b/server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js
index d780daaa5..e9875fe10 100644
--- a/server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js
+++ b/server/integrations/partsManagement/endpoints/partsManagementDeprovisioning.js
@@ -144,7 +144,7 @@ const partsManagementDeprovisioning = async (req, res) => {
       } catch (userError) {
         logger.log("admin-delete-user-error", "warn", null, null, {
           email: user.email,
-          error: userError.message
+          error: userError.message || userError
         });
       }
     }