diff --git a/src/components/CreateAccountModal.tsx b/src/components/CreateAccountModal.tsx
index 5dc352a..00ff527 100644
--- a/src/components/CreateAccountModal.tsx
+++ b/src/components/CreateAccountModal.tsx
@@ -55,8 +55,8 @@ function CreateAccountModal({
   const keys = wallet?.keychain || [];
   const defaultValues = {
     displayName: '',
-    required: 1,
-    publicKeys: [keys[0]?.publicKey || '0x1'],
+    Required: 1,
+    PublicKeys: [keys[0]?.publicKey || '0x1'],
   };
   const {
     watch,
@@ -73,36 +73,36 @@ function CreateAccountModal({
     defaultValues,
   });
   const selectedTemplate = watch('templateAddress');
-  const selectedOwner = watch('owner');
-  const totalAmount = watch('totalAmount');
+  const selectedOwner = watch('Owner');
+  const totalAmount = watch('TotalAmount');
 
   useEffect(() => {
     if (selectedTemplate === StdPublicKeys.Vault) {
-      register('initialUnlockAmount', {
+      register('InitialUnlockAmount', {
         required: 'Please specify the initial unlock amount',
       });
-      return () => unregister('initialUnlockAmount');
+      return () => unregister('InitialUnlockAmount');
     }
     return noop;
   }, [register, selectedTemplate, unregister]);
 
   useEffect(() => {
-    const owner = selectedOwner || getValues('owner');
+    const owner = selectedOwner || getValues('Owner');
     if (Object.hasOwn(GENESIS_VESTING_ACCOUNTS, owner)) {
       const amount =
         GENESIS_VESTING_ACCOUNTS[
           owner as keyof typeof GENESIS_VESTING_ACCOUNTS
         ];
-      setValue('totalAmount', String(amount));
-      setValue('initialUnlockAmount', String(amount / 4n));
-      setValue('vestingStart', GENESIS_VESTING_START);
-      setValue('vestingEnd', GENESIS_VESTING_END);
+      setValue('TotalAmount', String(amount));
+      setValue('InitialUnlockAmount', String(amount / 4n));
+      setValue('VestingStart', GENESIS_VESTING_START);
+      setValue('VestingEnd', GENESIS_VESTING_END);
     }
   }, [getValues, selectedOwner, selectedTemplate, setValue]);
 
   useEffect(() => {
     if (totalAmount) {
-      setValue('initialUnlockAmount', String(BigInt(totalAmount) / 4n));
+      setValue('InitialUnlockAmount', String(BigInt(totalAmount) / 4n));
     }
   }, [totalAmount, setValue]);
 
@@ -138,7 +138,7 @@ function CreateAccountModal({
               pre-defined vesting schedule.
             </Text>
             <FormAddressSelect
-              fieldName="owner"
+              fieldName="Owner"
               accounts={accounts.filter(
                 (acc) => acc.templateAddress === StdPublicKeys.Vesting
               )}
@@ -153,7 +153,7 @@ function CreateAccountModal({
             <FormInput
               label="Total amount"
               inputProps={{ type: 'number' }}
-              register={register('totalAmount', {
+              register={register('TotalAmount', {
                 required: 'Please specify total amount locked in the vault',
               })}
               errors={errors}
@@ -162,7 +162,7 @@ function CreateAccountModal({
             <FormInput
               label="Vesting start (layer number)"
               inputProps={{ type: 'number' }}
-              register={register('vestingStart', {
+              register={register('VestingStart', {
                 required: 'Please specify the epoch when the vesting starts',
                 valueAsNumber: true,
               })}
@@ -172,7 +172,7 @@ function CreateAccountModal({
             <FormInput
               label="Vesting end (layer number)"
               inputProps={{ type: 'number' }}
-              register={register('vestingEnd', {
+              register={register('VestingEnd', {
                 required: 'Please specify the epoch when the vesting ends',
                 valueAsNumber: true,
               })}
@@ -191,7 +191,7 @@ function CreateAccountModal({
             <FormInput
               label="Required amount of signatures"
               inputProps={{ type: 'number' }}
-              register={register('required', {
+              register={register('Required', {
                 required: 'Please specify any number from 0 to 10',
                 valueAsNumber: true,
                 validate: (n) => {
@@ -210,7 +210,7 @@ function CreateAccountModal({
             <FormMultiKeySelect
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
               // @ts-ignore
-              fieldName="publicKeys"
+              fieldName="PublicKeys"
               keys={keys}
               control={control}
               register={register}
@@ -232,7 +232,7 @@ function CreateAccountModal({
             <FormInput
               label="Required amount of signatures"
               inputProps={{ type: 'number' }}
-              register={register('required', {
+              register={register('Required', {
                 required: 'Please specify any number from 0 to 10',
                 valueAsNumber: true,
                 validate: (n) => {
@@ -251,7 +251,7 @@ function CreateAccountModal({
             <FormMultiKeySelect
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment
               // @ts-ignore
-              fieldName="publicKeys"
+              fieldName="PublicKeys"
               keys={keys}
               control={control}
               register={register}
@@ -271,13 +271,14 @@ function CreateAccountModal({
               transaction.
             </Text>
             <FormKeySelect
-              fieldName="publicKey"
+              fieldName="PublicKey"
               keys={keys}
               register={register}
               unregister={unregister}
               errors={errors}
               isSubmitted={isSubmitted}
               isRequired
+              value={keys[0]?.publicKey}
             />
           </>
         );
diff --git a/src/components/EditAccountModal.tsx b/src/components/EditAccountModal.tsx
new file mode 100644
index 0000000..b615d30
--- /dev/null
+++ b/src/components/EditAccountModal.tsx
@@ -0,0 +1,377 @@
+import { useEffect } from 'react';
+import { Form, useForm } from 'react-hook-form';
+
+import {
+  Box,
+  Button,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalFooter,
+  ModalHeader,
+  ModalOverlay,
+  Text,
+} from '@chakra-ui/react';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { StdPublicKeys } from '@spacemesh/sm-codec';
+
+import { useCurrentHRP } from '../hooks/useNetworkSelectors';
+import { useAccountsList } from '../hooks/useWalletSelectors';
+import usePassword from '../store/usePassword';
+import useWallet from '../store/useWallet';
+import {
+  GENESIS_VESTING_ACCOUNTS,
+  GENESIS_VESTING_END,
+  GENESIS_VESTING_START,
+} from '../utils/constants';
+import { noop } from '../utils/func';
+import {
+  getTemplateNameByKey,
+  MultiSigSpawnArguments,
+  SingleSigSpawnArguments,
+  VaultSpawnArguments,
+  VestingSpawnArguments,
+} from '../utils/templates';
+
+import {
+  extractSpawnArgs,
+  FormSchema,
+  FormValues,
+} from './createAccountSchema';
+import FormAddressSelect from './FormAddressSelect';
+import FormInput from './FormInput';
+import FormKeySelect from './FormKeySelect';
+import FormMultiKeySelect from './FormMultiKeySelect';
+import FormSelect from './FormSelect';
+
+type EditAccountModalProps = {
+  accountIndex: number;
+  isOpen: boolean;
+  onClose: () => void;
+};
+
+function EditAccountModal({
+  accountIndex,
+  isOpen,
+  onClose,
+}: EditAccountModalProps): JSX.Element {
+  const { editAccount, wallet } = useWallet();
+  const { withPassword } = usePassword();
+  const hrp = useCurrentHRP();
+  const accounts = useAccountsList(hrp);
+  const keys = wallet?.keychain || [];
+  const defaultValues = {
+    displayName: '',
+    required: 1,
+    publicKeys: [keys[0]?.publicKey || '0x1'],
+  };
+  const {
+    watch,
+    register,
+    unregister,
+    reset,
+    control,
+    handleSubmit,
+    setValue,
+    getValues,
+    formState: { errors, isSubmitted },
+  } = useForm<FormValues>({
+    resolver: zodResolver(FormSchema),
+    defaultValues,
+  });
+  const selectedTemplate = watch('templateAddress');
+  const selectedOwner = watch('Owner');
+  const totalAmount = watch('TotalAmount');
+
+  const account = wallet?.accounts[accountIndex];
+  if (!account) {
+    throw new Error(`Account with index ${accountIndex} not found`);
+  }
+
+  useEffect(() => {
+    const formValues = {
+      displayName: account.displayName,
+      templateAddress: account.templateAddress,
+      ...account.spawnArguments,
+    } as Parameters<typeof reset>[0];
+    reset(formValues);
+
+    return () => reset();
+  }, [account, reset]);
+
+  useEffect(() => {
+    if (selectedTemplate === StdPublicKeys.Vault) {
+      register('InitialUnlockAmount', {
+        required: 'Please specify the initial unlock amount',
+      });
+      return () => unregister('InitialUnlockAmount');
+    }
+    return noop;
+  }, [register, selectedTemplate, unregister]);
+
+  useEffect(() => {
+    const owner = selectedOwner || getValues('Owner');
+    if (Object.hasOwn(GENESIS_VESTING_ACCOUNTS, owner)) {
+      const amount =
+        GENESIS_VESTING_ACCOUNTS[
+          owner as keyof typeof GENESIS_VESTING_ACCOUNTS
+        ];
+      setValue('TotalAmount', String(amount));
+      setValue('InitialUnlockAmount', String(amount / 4n));
+      setValue('VestingStart', GENESIS_VESTING_START);
+      setValue('VestingEnd', GENESIS_VESTING_END);
+    }
+  }, [getValues, selectedOwner, selectedTemplate, setValue]);
+
+  useEffect(() => {
+    if (totalAmount) {
+      setValue('InitialUnlockAmount', String(BigInt(totalAmount) / 4n));
+    }
+  }, [totalAmount, setValue]);
+
+  const submit = handleSubmit(async (data) => {
+    const success = await withPassword(
+      (password) =>
+        editAccount(
+          accountIndex,
+          data.displayName,
+          data.templateAddress,
+          extractSpawnArgs(data),
+          password
+        ),
+      'Edit Account',
+      // eslint-disable-next-line max-len
+      `Please enter the password to save changes in the account "${
+        data.displayName
+      }" of type "${getTemplateNameByKey(data.templateAddress)}"`
+    );
+    if (success) {
+      reset(defaultValues);
+      onClose();
+    }
+  });
+
+  const renderTemplateSpecificFields = () => {
+    switch (selectedTemplate) {
+      case StdPublicKeys.Vault: {
+        const args = account.spawnArguments as VaultSpawnArguments;
+        return (
+          <>
+            <Text fontWeight="bold">Vault</Text>
+            <Text fontSize="sm" mb={1}>
+              The vault holds some funds for its owner and unlocks them due to
+              pre-defined vesting schedule.
+            </Text>
+            <FormAddressSelect
+              fieldName="Owner"
+              accounts={accounts.filter(
+                (acc) => acc.templateAddress === StdPublicKeys.Vesting
+              )}
+              register={register}
+              unregister={unregister}
+              errors={errors}
+              isSubmitted={isSubmitted}
+              isRequired
+              setValue={setValue}
+              getValues={getValues}
+            />
+            <FormInput
+              label="Total amount"
+              inputProps={{ type: 'number' }}
+              register={register('TotalAmount', {
+                value: args.TotalAmount,
+                required: 'Please specify total amount locked in the vault',
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <FormInput
+              label="Vesting start (layer number)"
+              inputProps={{ type: 'number' }}
+              register={register('VestingStart', {
+                value: args.VestingStart,
+                required: 'Please specify the epoch when the vesting starts',
+                valueAsNumber: true,
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <FormInput
+              label="Vesting end (layer number)"
+              inputProps={{ type: 'number' }}
+              register={register('VestingEnd', {
+                value: args.VestingEnd,
+                required: 'Please specify the epoch when the vesting ends',
+                valueAsNumber: true,
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+          </>
+        );
+      }
+      case StdPublicKeys.Vesting: {
+        const args = account.spawnArguments as VestingSpawnArguments;
+        return (
+          <>
+            <Text fontWeight="bold">Vesting Account</Text>
+            <Text fontSize="sm" mb={1}>
+              It is used to drain Vault Accounts
+            </Text>
+            <FormInput
+              label="Required amount of signatures"
+              inputProps={{ type: 'number' }}
+              register={register('Required', {
+                value: args.Required,
+                required: 'Please specify any number from 0 to 10',
+                valueAsNumber: true,
+                validate: (n) => {
+                  if (n < 1) {
+                    return 'Required amount must be grater than 0';
+                  }
+                  if (n > 10) {
+                    return 'Required amount must be less or equal to 10';
+                  }
+                  return true;
+                },
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <FormMultiKeySelect
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              fieldName="PublicKeys"
+              keys={keys}
+              control={control}
+              register={register}
+              unregister={unregister}
+              errors={errors}
+              isSubmitted={isSubmitted}
+              values={args.PublicKeys}
+            />
+          </>
+        );
+      }
+      case StdPublicKeys.MultiSig: {
+        const args = account.spawnArguments as MultiSigSpawnArguments;
+        return (
+          <>
+            <Text fontWeight="bold">Multiple Signatures</Text>
+            <Text fontSize="sm" mb={1}>
+              MultiSig account requires more than one signature to submit a
+              transaction. You need to know Public Keys of other parties to
+              create a MultiSig account.
+            </Text>
+            <FormInput
+              label="Required amount of signatures"
+              inputProps={{ type: 'number' }}
+              register={register('Required', {
+                value: args.Required,
+                required: 'Please specify any number from 0 to 10',
+                valueAsNumber: true,
+                validate: (n) => {
+                  if (n < 1) {
+                    return 'Required amount must be grater than 0';
+                  }
+                  if (n > 10) {
+                    return 'Required amount must be less or equal to 10';
+                  }
+                  return true;
+                },
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <FormMultiKeySelect
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              fieldName="PublicKeys"
+              keys={keys}
+              control={control}
+              register={register}
+              unregister={unregister}
+              errors={errors}
+              isSubmitted={isSubmitted}
+              values={args.PublicKeys}
+            />
+          </>
+        );
+      }
+      case StdPublicKeys.SingleSig:
+      default: {
+        const args = account.spawnArguments as SingleSigSpawnArguments;
+        return (
+          <>
+            <Text fontWeight="bold">Single Signature</Text>
+            <Text fontSize="sm" mb={1}>
+              The default account that requires only one signature to submit a
+              transaction.
+            </Text>
+            <FormKeySelect
+              fieldName="PublicKey"
+              keys={keys}
+              register={register}
+              unregister={unregister}
+              errors={errors}
+              isSubmitted={isSubmitted}
+              isRequired
+              value={args.PublicKey}
+            />
+          </>
+        );
+      }
+    }
+  };
+
+  return (
+    <Modal isOpen={isOpen} onClose={onClose} isCentered size="lg">
+      <Form control={control}>
+        <ModalOverlay />
+        <ModalContent>
+          <ModalCloseButton />
+          <ModalHeader textAlign="center">Edit Account</ModalHeader>
+          <ModalBody>
+            <FormInput
+              label="Name"
+              register={register('displayName', {
+                required: 'Name is required',
+                minLength: {
+                  value: 2,
+                  message: 'Give your account a meaningful name',
+                },
+              })}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <FormSelect
+              label="Account type"
+              register={register('templateAddress', {
+                value: StdPublicKeys.SingleSig,
+              })}
+              options={[
+                { value: StdPublicKeys.SingleSig, label: 'SingleSig' },
+                { value: StdPublicKeys.MultiSig, label: 'MultiSig' },
+                { value: StdPublicKeys.Vault, label: 'Vault' },
+                { value: StdPublicKeys.Vesting, label: 'Vesting' },
+              ]}
+              errors={errors}
+              isSubmitted={isSubmitted}
+            />
+            <Box pt={2} pb={1} color="brand.lightGray">
+              {renderTemplateSpecificFields()}
+            </Box>
+          </ModalBody>
+          <ModalFooter>
+            <Button onClick={submit} variant="whiteModal" w="full">
+              Save
+            </Button>
+          </ModalFooter>
+        </ModalContent>
+      </Form>
+    </Modal>
+  );
+}
+
+export default EditAccountModal;
diff --git a/src/components/FormAddressSelect.tsx b/src/components/FormAddressSelect.tsx
index 9c97eff..323ad28 100644
--- a/src/components/FormAddressSelect.tsx
+++ b/src/components/FormAddressSelect.tsx
@@ -66,24 +66,35 @@ function FormAddressSelect<T extends FieldValues, FieldName extends Path<T>>({
   setValue,
   getValues,
 }: Props<T, FieldName>): JSX.Element {
+  const value = getValues(fieldName);
+  const isLocalAddress = !!accounts.find((x) => x.address === value);
   const [origin, setOrigin] = useState(
-    defaultForeign ? Origin.Foreign : Origin.Local
+    defaultForeign || (value && !isLocalAddress) ? Origin.Foreign : Origin.Local
   );
   const prevOrigin = useRef(origin);
+
   useEffect(() => () => unregister(fieldName), [unregister, fieldName, origin]);
   useEffect(() => {
     const firstLocal = accounts?.[0]?.address;
-    const val = getValues(fieldName);
-    const foundVal = accounts.find((x) => x.address === val);
     if (
       prevOrigin.current !== origin &&
       origin === Origin.Local &&
       !!firstLocal &&
-      !foundVal
+      !isLocalAddress
     ) {
+      // If switched from foreign to local,
+      // but values is not a local one — switch to the first local
       setValue(fieldName, firstLocal as PathValue<T, FieldName>);
     }
-  }, [prevOrigin, origin, accounts, setValue, fieldName, getValues]);
+  }, [
+    prevOrigin,
+    origin,
+    accounts,
+    setValue,
+    fieldName,
+    value,
+    isLocalAddress,
+  ]);
 
   const error = get(errors, fieldName) as FieldError | undefined;
   const renderInputs = () => {
@@ -93,9 +104,7 @@ function FormAddressSelect<T extends FieldValues, FieldName extends Path<T>>({
           <Input
             {...register(fieldName, {
               required: isRequired ? 'Please pick the address' : false,
-              value: (!defaultForeign
-                ? accounts[0]?.address ?? ''
-                : '') as PathValue<T, FieldName>,
+              value,
               validate: (val) => {
                 try {
                   Bech32AddressSchema.parse(val);
@@ -110,7 +119,14 @@ function FormAddressSelect<T extends FieldValues, FieldName extends Path<T>>({
       case Origin.Local:
       default:
         return (
-          <Select {...register(fieldName)}>
+          <Select
+            {...register(fieldName, {
+              value: ((value || accounts[0]?.address) ?? '') as PathValue<
+                T,
+                FieldName
+              >,
+            })}
+          >
             {accounts.map((acc) => (
               <option
                 key={`${acc.address}_${acc.displayName}`}
diff --git a/src/components/KeyManager.tsx b/src/components/KeyManager.tsx
index a13af02..ddf61a8 100644
--- a/src/components/KeyManager.tsx
+++ b/src/components/KeyManager.tsx
@@ -57,6 +57,7 @@ import { safeKeyForAccount } from '../utils/wallet';
 import CopyButton from './CopyButton';
 import CreateAccountModal from './CreateAccountModal';
 import CreateKeyPairModal from './CreateKeyPairModal';
+import EditAccountModal from './EditAccountModal';
 import ExplorerButton from './ExplorerButton';
 import ImportAccountModal from './ImportAccountModal';
 import ImportKeyFromLedgerModal from './ImportKeyFromLedgerModal';
@@ -101,7 +102,7 @@ const renderSingleKey = (key: SafeKeyWithType): JSX.Element =>
   );
 
 function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
-  const { wallet, deleteKey } = useWallet();
+  const { wallet, deleteKey, deleteAccount } = useWallet();
   const hrp = useCurrentHRP();
   const accounts = useAccountsList(hrp);
 
@@ -115,8 +116,10 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
   const importFromLedgerModal = useDisclosure();
   const createAccountModal = useDisclosure();
   const importAccountModal = useDisclosure();
+  const editAccountModal = useDisclosure();
 
   const [renameKeyIdx, setRenameKeyIdx] = useState(0);
+  const [editAccountIdx, setEditAccountIdx] = useState(0);
 
   const closeHandler = () => {
     onClose();
@@ -141,6 +144,25 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
       'You cannot undo this action, but you always can import the key again or derive it if you know the path.',
       true
     );
+  const onEditAccount = (idx: number) => {
+    setEditAccountIdx(idx);
+    editAccountModal.onOpen();
+  };
+  const onDeleteAccount = (idx: number) =>
+    withConfirmation(
+      () =>
+        withPassword(
+          (pass) => deleteAccount(idx, pass),
+          'Delete Account',
+          // eslint-disable-next-line max-len
+          'Please type in the password to delete the account and store the wallet secrets without it'
+        ),
+      'Delete key',
+      'Are you sure you want to delete this account?',
+      // eslint-disable-next-line max-len
+      'You cannot undo this action, but you always can create or import the account again.',
+      true
+    );
 
   const exportAccount = (acc: AccountWithAddress) =>
     fileDownload(
@@ -287,7 +309,7 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
                           size="xs"
                         />
                         <IconButton
-                          ml={2}
+                          ml={1}
                           aria-label="Delete key"
                           onClick={() => onDeleteKey(idx)}
                           icon={<IconTrash size={12} />}
@@ -332,7 +354,7 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
                   </Button>
                 </Flex>
                 <Box flex={1}>
-                  {accounts.map((acc) => {
+                  {accounts.map((acc, idx) => {
                     const keys = getKeysByAccount(acc);
                     return (
                       <Box
@@ -361,10 +383,38 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
                         </Button>
                         <Text fontSize="md">
                           <strong>{acc.displayName}</strong>
+                          <IconButton
+                            ml={2}
+                            aria-label="Edit account"
+                            onClick={() => onEditAccount(idx)}
+                            icon={<IconEdit size={12} />}
+                            variant="whiteOutline"
+                            borderWidth={1}
+                            size="xs"
+                          />
+                          <IconButton
+                            ml={1}
+                            aria-label="Delete account"
+                            onClick={() => onDeleteAccount(idx)}
+                            icon={<IconTrash size={12} />}
+                            variant="dangerOutline"
+                            borderWidth={1}
+                            size="xs"
+                          />
+                        </Text>
+                        <Text mt={1}>
+                          {acc.address}
+                          <CopyButton value={acc.address} withOutline />
+                          <ExplorerButton
+                            dataType="accounts"
+                            value={acc.address}
+                            ml={1}
+                          />
+                        </Text>
+                        <Text fontSize="md">
                           <Badge
                             fontWeight="normal"
                             fontSize="xx-small"
-                            ml={1}
                             colorScheme={getTemplateColorByKey(
                               acc.templateAddress
                             )}
@@ -401,15 +451,6 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
                             )}
                           </Badge>
                         </Text>
-                        <Text mb={4}>
-                          {acc.address}
-                          <CopyButton value={acc.address} withOutline />
-                          <ExplorerButton
-                            dataType="accounts"
-                            value={acc.address}
-                            ml={1}
-                          />
-                        </Text>
 
                         <Box color="grey">
                           {Object.entries(
@@ -460,6 +501,11 @@ function KeyManager({ isOpen, onClose }: KeyManagerProps): JSX.Element {
             isOpen={importAccountModal.isOpen}
             onClose={importAccountModal.onClose}
           />
+          <EditAccountModal
+            accountIndex={editAccountIdx}
+            isOpen={editAccountModal.isOpen}
+            onClose={editAccountModal.onClose}
+          />
         </DrawerBody>
       </DrawerContent>
     </Drawer>
diff --git a/src/components/createAccountSchema.tsx b/src/components/createAccountSchema.tsx
index d9faecc..7bb0309 100644
--- a/src/components/createAccountSchema.tsx
+++ b/src/components/createAccountSchema.tsx
@@ -10,30 +10,30 @@ const DisplayNameSchema = z.string().min(2);
 const SingleSigSchema = z.object({
   displayName: DisplayNameSchema,
   templateAddress: z.literal(StdPublicKeys.SingleSig),
-  publicKey: HexStringSchema,
+  PublicKey: HexStringSchema,
 });
 const MultiSigSchema = z.object({
   displayName: DisplayNameSchema,
   templateAddress: z.literal(StdPublicKeys.MultiSig),
-  required: z.number().min(0).max(10),
-  publicKeys: z
+  Required: z.number().min(0).max(10),
+  PublicKeys: z
     .array(HexStringSchema)
     .min(1, 'MultiSig account requires at least two parties'),
 });
 const VaultSchema = z.object({
   displayName: DisplayNameSchema,
   templateAddress: z.literal(StdPublicKeys.Vault),
-  owner: Bech32AddressSchema,
-  totalAmount: z.string().min(0),
-  initialUnlockAmount: z.string().min(0),
-  vestingStart: z.number().min(0),
-  vestingEnd: z.number().min(0),
+  Owner: Bech32AddressSchema,
+  TotalAmount: z.string().min(0),
+  InitialUnlockAmount: z.string().min(0),
+  VestingStart: z.number().min(0),
+  VestingEnd: z.number().min(0),
 });
 const VestingSchema = z.object({
   displayName: DisplayNameSchema,
   templateAddress: z.literal(StdPublicKeys.Vesting),
-  required: z.number().min(0).max(10),
-  publicKeys: z
+  Required: z.number().min(0).max(10),
+  PublicKeys: z
     .array(HexStringSchema)
     .min(1, 'Vesting account requires at least two parties'),
 });
@@ -48,25 +48,19 @@ export const extractSpawnArgs = (data: FormValues): AnySpawnArguments => {
   let args;
   args = SingleSigSchema.safeParse(data);
   if (args.success) {
-    return { PublicKey: args.data.publicKey };
+    return { PublicKey: args.data.PublicKey };
   }
   args = MultiSigSchema.safeParse(data);
   if (args.success) {
-    return { Required: args.data.required, PublicKeys: args.data.publicKeys };
+    return args.data;
   }
   args = VestingSchema.safeParse(data);
   if (args.success) {
-    return { Required: args.data.required, PublicKeys: args.data.publicKeys };
+    return args.data;
   }
   args = VaultSchema.safeParse(data);
   if (args.success) {
-    return {
-      Owner: args.data.owner,
-      TotalAmount: args.data.totalAmount,
-      InitialUnlockAmount: args.data.initialUnlockAmount,
-      VestingStart: args.data.vestingStart,
-      VestingEnd: args.data.vestingEnd,
-    };
+    return args.data;
   }
 
   throw new Error('Cannot get required inputs to create an account');
diff --git a/src/store/useWallet.ts b/src/store/useWallet.ts
index a1356f9..8291d60 100644
--- a/src/store/useWallet.ts
+++ b/src/store/useWallet.ts
@@ -101,6 +101,14 @@ type WalletActions = {
     spawnArguments: T,
     password: string
   ) => Promise<Account<T>>;
+  editAccount: <T extends AnySpawnArguments>(
+    idx: number,
+    displayName: string,
+    templateAddress: StdTemplateKeys,
+    spawnArguments: T,
+    password: string
+  ) => Promise<Account<T>>;
+  deleteAccount: (idx: number, password: string) => Promise<boolean>;
 };
 
 type WalletSelectors = {
@@ -396,6 +404,68 @@ const useWallet = create<WalletState & WalletActions & WalletSelectors>(
 
       return acc;
     },
+    editAccount: async (
+      idx,
+      displayName,
+      templateAddress,
+      spawnArguments,
+      password
+    ) => {
+      const wallet = await get().loadWalletWithSecrets(password);
+      const acc = wallet.crypto.accounts[idx];
+      if (!acc) {
+        throw new Error(`Cannot find an account by index "${idx}"`);
+      }
+      const newAcc = {
+        ...acc,
+        displayName,
+        templateAddress,
+        spawnArguments,
+      };
+      // Preparing secret part of the wallet
+      const newSecrets = {
+        ...wallet.crypto,
+        accounts: [...A.updateAt(wallet.crypto.accounts, idx, () => newAcc)],
+      };
+      // Updating App state
+      set({
+        wallet: extractData({
+          meta: wallet.meta,
+          crypto: newSecrets,
+        }),
+      });
+      // Saving a wallet file in the storage
+      saveToLocalStorage(WALLET_STORE_KEY, {
+        ...wallet,
+        crypto: await encryptWallet(newSecrets, password),
+      });
+
+      return newAcc;
+    },
+    deleteAccount: async (idx, password) => {
+      const wallet = await get().loadWalletWithSecrets(password);
+      const acc = wallet.crypto.accounts[idx];
+      if (!acc) {
+        throw new Error(`Cannot find an account by index "${idx}"`);
+      }
+      const newSecrets = {
+        ...wallet.crypto,
+        accounts: [...A.removeAt(wallet.crypto.accounts, idx)],
+      };
+      // Updating App state
+      set({
+        wallet: extractData({
+          meta: wallet.meta,
+          crypto: newSecrets,
+        }),
+      });
+      // Saving a wallet file in the storage
+      saveToLocalStorage(WALLET_STORE_KEY, {
+        ...wallet,
+        crypto: await encryptWallet(newSecrets, password),
+      });
+      return true;
+    },
     // Selectors
     hasWallet: () => {
       const file = loadFromLocalStorage<null | WalletFile>(WALLET_STORE_KEY);