diff --git a/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue
index 4fd811a..577eda7 100644
--- a/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue
+++ b/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue
@@ -110,7 +110,7 @@ const formRef = ref();
 const validation = yup.object({
     tankId: stringRequiredSchema,
     ruleSetId: numberRequiredSchema.typeError('Rule Set ID must be a number'),
-    userId: stringRequiredSchema,
+    userId: stringNotRequiredSchema,
     totalConsumed: numberRequiredSchema.typeError('Total Consumed must be a number'),
     lastResetBlock: numberNotRequiredSchema.typeError('Last Reset Block must be a number'),
     idempotencyKey: stringNotRequiredSchema,
diff --git a/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue
index c5a9dd1..8cb9d0a 100644
--- a/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue
+++ b/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue
@@ -119,6 +119,12 @@ import { addressToPublicKey } from '~/util/address';
 import { TokenIdType } from '~/types/types.interface';
 import { useAppStore } from '~/store';
 import FormSelect from '~/components/FormSelect.vue';
+import {
+    booleanNotRequiredSchema,
+    booleanRequiredSchema,
+    stringNotRequiredSchema,
+    stringRequiredSchema,
+} from '~/util/schemas';
 
 const emit = defineEmits(['close']);
 
@@ -166,14 +172,18 @@ const removeCaller = (index: number) => {
 };
 
 const validation = yup.object({
-    tankId: yup.string().required(),
-    providesDeposit: yup.boolean().required(),
-    reservesExistentialDeposit: yup.boolean(),
-    reservesAccountCreationDeposit: yup.boolean(),
-    whitelistedCallers: yup.string().nullable(),
-    collectionId: yup.string().nullable(),
-    tokenId: yup.string().nullable(),
-    idempotencyKey: yup.string().nullable(),
+    tankId: stringRequiredSchema,
+    providesDeposit: booleanRequiredSchema,
+    reservesExistentialDeposit: booleanNotRequiredSchema,
+    reservesAccountCreationDeposit: booleanNotRequiredSchema,
+    whitelistedCallers: yup.array().of(
+        yup.object({
+            caller: stringRequiredSchema,
+        })
+    ),
+    collectionId: stringNotRequiredSchema,
+    tokenId: stringNotRequiredSchema,
+    idempotencyKey: stringNotRequiredSchema,
 });
 
 const mutateFuelTank = async () => {
@@ -190,7 +200,7 @@ const mutateFuelTank = async () => {
                     reservesExistentialDeposit: reservesExistentialDeposit.value,
                     reservesAccountCreationDeposit: reservesAccountCreationDeposit.value,
                     accountRules: {
-                        whitelistedCallers: whitelistedCallers.value.map((item: any) => item.caller),
+                        whitelistedCallers: formatData(whitelistedCallers.value.map((item: any) => item.caller)),
                         requireToken: collectionId.value
                             ? {
                                   collectionId: collectionId.value,