diff --git a/new-lamassu-admin/src/components/inputs/formik/Checkbox.js b/new-lamassu-admin/src/components/inputs/formik/Checkbox.js
index 456827a8..aa1768ad 100644
--- a/new-lamassu-admin/src/components/inputs/formik/Checkbox.js
+++ b/new-lamassu-admin/src/components/inputs/formik/Checkbox.js
@@ -2,24 +2,33 @@ import React, { memo } from 'react'
 
 import { Checkbox } from '../base'
 
-const CheckboxInput = memo(({ label, textAlign, fullWidth, ...props }) => {
-  const { name, onChange, value } = props.field
+const CheckboxInput = memo(
+  ({
+    label,
+    textAlign,
+    fullWidth,
+    enabled = true,
+    disabledMessage = '',
+    ...props
+  }) => {
+    const { name, onChange, value } = props.field
 
-  const settings = {
-    enabled: props.enabled ?? true,
-    label: label,
-    disabledMessage: props.disabledMessage ?? ''
+    const settings = {
+      enabled: enabled,
+      label: label,
+      disabledMessage: disabledMessage
+    }
+
+    return (
+      <Checkbox
+        name={name}
+        onChange={onChange}
+        value={value}
+        settings={settings}
+        {...props}
+      />
+    )
   }
-
-  return (
-    <Checkbox
-      name={name}
-      onChange={onChange}
-      value={value}
-      settings={settings}
-      {...props}
-    />
-  )
-})
+)
 
 export default CheckboxInput