diff --git a/src/common/WiFiSettings/WiFiForm.js b/src/common/WiFiSettings/WiFiForm.js
index a779f77..34aa2f7 100644
--- a/src/common/WiFiSettings/WiFiForm.js
+++ b/src/common/WiFiSettings/WiFiForm.js
@@ -36,7 +36,7 @@ WiFiForm.defaultProps = {
 };
 
 export default function WiFiForm({
-    formData, formErrors, setFormValue, hasGuestNetwork, ...props
+    formData, formErrors, setFormValue, hasGuestNetwork, disabled,
 }) {
     return formData.devices.map((device) => (
         <DeviceForm
@@ -45,8 +45,7 @@ export default function WiFiForm({
             formErrors={(formErrors || [])[device.id]}
             setFormValue={setFormValue}
             hasGuestNetwork={hasGuestNetwork}
-
-            {...props}
+            disabled={disabled}
         />
     ));
 }
diff --git a/src/form/components/ForisForm.js b/src/form/components/ForisForm.js
index fd66abf..e2cf06e 100644
--- a/src/form/components/ForisForm.js
+++ b/src/form/components/ForisForm.js
@@ -149,6 +149,7 @@ export function ForisForm({
     const childrenWithFormProps = React.Children.map(
         children,
         (child) => React.cloneElement(child, {
+            initialData: formState.initialData,
             formData: formState.data,
             formErrors: formState.errors,
             setFormValue: onFormChangeHandler,