diff --git a/client/src/containers/Items/ItemFormPrimarySection.js b/client/src/containers/Items/ItemFormPrimarySection.js
index 621609ea8..531683b7c 100644
--- a/client/src/containers/Items/ItemFormPrimarySection.js
+++ b/client/src/containers/Items/ItemFormPrimarySection.js
@@ -31,7 +31,7 @@ export default function ItemFormPrimarySection() {
   const nameFieldRef = useRef(null);
 
   // Formik context.
-  const { values: { itemType } } = useFormikContext();
+  const { values: { type } } = useFormikContext();
 
   useEffect(() => {
     // Auto focus item name field once component mount.
@@ -87,7 +87,7 @@ export default function ItemFormPrimarySection() {
                 form.setFieldValue('type', _value);
               })}
               selectedValue={value}
-              disabled={itemType === 'inventory'}
+              disabled={type === 'inventory'}
             >
               <Radio label={<T id={'service'} />} value="service" />
               <Radio label={<T id={'non_inventory'} />} value="non-inventory" />
diff --git a/client/src/containers/Vendors/VendorForm/VendorFormProvider.js b/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
index 3c55e118e..e559846b9 100644
--- a/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
+++ b/client/src/containers/Vendors/VendorForm/VendorFormProvider.js
@@ -29,6 +29,7 @@ function VendorFormProvider({ vendorId, ...props }) {
   const [submitPayload, setSubmitPayload] = useState({});
 
   const provider = {
+    vendorId,
     currencies,
     vendor,
     submitPayload,
diff --git a/client/src/hooks/query/accounts.js b/client/src/hooks/query/accounts.js
index afaa01b7c..d0b69e6c0 100644
--- a/client/src/hooks/query/accounts.js
+++ b/client/src/hooks/query/accounts.js
@@ -82,7 +82,7 @@ export function useEditAccount(props) {
   const query = useQueryClient();
 
   return useMutation(
-    ([values, id]) => ApiService.post(`accounts/${id}`, values),
+    ([id,values]) => ApiService.post(`accounts/${id}`, values),
     {
       onSuccess: () => {
         query.invalidateQueries('ACCOUNTS');