diff --git a/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx b/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx
index 7881028e..2c96554c 100644
--- a/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx
+++ b/src/routes/safe/components/AddressBook/CreateEditEntryModal/index.jsx
@@ -58,6 +58,13 @@ const CreateEditEntryModalComponent = ({
   const addressBook = useSelector(getAddressBookListSelector)
   const addressBookAddressesList = getAddressesListFromAdbk(addressBook)
   const entryDoesntExist = uniqueAddress(addressBookAddressesList)
+
+  const formMutators = {
+    setOwnerAddress: (args, state, utils) => {
+      utils.changeValue(state, 'address', () => args[0])
+    },
+  }
+
   return (
     <Modal
       title={entryToEdit ? 'Edit entry' : 'Create new entry'}
@@ -75,58 +82,60 @@ const CreateEditEntryModalComponent = ({
         </IconButton>
       </Row>
       <Hairline />
-      <GnoForm onSubmit={onFormSubmitted}>
-        {() => (
-          <>
-            <Block className={classes.container}>
-              <Row margin="md">
-                <Field
-                  name="name"
-                  component={TextField}
-                  type="text"
-                  validate={composeValidators(required, minMaxLength(1, 50))}
-                  placeholder={entryToEdit ? 'Entry name' : 'New entry'}
-                  text={entryToEdit ? 'Entry*' : 'New entry*'}
-                  className={classes.addressInput}
-                  testId={CREATE_ENTRY_INPUT_NAME_ID}
-                  defaultValue={entryToEdit ? entryToEdit.entry.name : undefined}
-                />
+      <GnoForm onSubmit={onFormSubmitted} formMutators={formMutators}>
+        {(...args) => {
+          const mutators = args[3]
+          return (
+            <>
+              <Block className={classes.container}>
+                <Row margin="md">
+                  <Field
+                    name="name"
+                    component={TextField}
+                    type="text"
+                    validate={composeValidators(required, minMaxLength(1, 50))}
+                    placeholder={entryToEdit ? 'Entry name' : 'New entry'}
+                    text={entryToEdit ? 'Entry*' : 'New entry*'}
+                    className={classes.addressInput}
+                    testId={CREATE_ENTRY_INPUT_NAME_ID}
+                    defaultValue={entryToEdit ? entryToEdit.entry.name : undefined}
+                  />
+                </Row>
+                <Row margin="md">
+                  <AddressInput
+                    name="address"
+                    validators={entryToEdit ? undefined : [entryDoesntExist]}
+                    placeholder="Owner address*"
+                    text="Owner address*"
+                    className={classes.addressInput}
+                    fieldMutator={mutators.setOwnerAddress}
+                    testId={CREATE_ENTRY_INPUT_ADDRESS_ID}
+                    defaultValue={entryToEdit ? entryToEdit.entry.address : undefined}
+                  />
+                </Row>
+              </Block>
+              <Hairline />
+              <Row align="center" className={classes.buttonRow}>
+                <Button minWidth={140} minHeight={42} onClick={onClose}>
+                  Cancel
+                </Button>
+                <Button
+                  type="submit"
+                  variant="contained"
+                  minWidth={140}
+                  minHeight={42}
+                  color="primary"
+                  testId={SAVE_NEW_ENTRY_BTN_ID}
+                >
+                  {entryToEdit ? 'Save' : 'Create'}
+                </Button>
               </Row>
-              <Row margin="md">
-                <AddressInput
-                  name="address"
-                  validators={entryToEdit ? undefined : [entryDoesntExist]}
-                  placeholder="Owner address*"
-                  text="Owner address*"
-                  className={classes.addressInput}
-                  testId={CREATE_ENTRY_INPUT_ADDRESS_ID}
-                  defaultValue={entryToEdit ? entryToEdit.entry.address : newEntryDefaultAddress}
-                />
-              </Row>
-            </Block>
-            <Hairline />
-            <Row align="center" className={classes.buttonRow}>
-              <Button minWidth={140} minHeight={42} onClick={onClose}>
-                Cancel
-              </Button>
-              <Button
-                type="submit"
-                variant="contained"
-                minWidth={140}
-                minHeight={42}
-                color="primary"
-                testId={SAVE_NEW_ENTRY_BTN_ID}
-              >
-                {entryToEdit ? 'Save' : 'Create'}
-              </Button>
-            </Row>
-          </>
-        )}
+            </>
+          )
+        }}
       </GnoForm>
     </Modal>
   )
 }
 
-const CreateEditEntryModal = withStyles(styles)(CreateEditEntryModalComponent)
-
-export default CreateEditEntryModal
+export default withStyles(styles)(CreateEditEntryModalComponent)