diff --git a/src/app/(sidebar)/account/create/page.tsx b/src/app/(sidebar)/account/create/page.tsx
index f2686ada..802a131c 100644
--- a/src/app/(sidebar)/account/create/page.tsx
+++ b/src/app/(sidebar)/account/create/page.tsx
@@ -1,29 +1,78 @@
 "use client";
 
-import { useState } from "react";
-import { useRouter } from "next/navigation";
+import { useCallback, useEffect, useState } from "react";
 import { Card, Text, Button } from "@stellar/design-system";
 import { Keypair } from "@stellar/stellar-sdk";
 
-import { useIsTestingNetwork } from "@/hooks/useIsTestingNetwork";
-import { Routes } from "@/constants/routes";
 import { useStore } from "@/store/useStore";
+import { useFriendBot } from "@/query/useFriendBot";
+import { useQueryClient } from "@tanstack/react-query";
+
+import { useIsTestingNetwork } from "@/hooks/useIsTestingNetwork";
+
 import { GenerateKeypair } from "@/components/GenerateKeypair";
 import { ExpandBox } from "@/components/ExpandBox";
+import { SuccessMsg } from "@/components/FriendBot/SuccessMsg";
+import { ErrorMsg } from "@/components/FriendBot/ErrorMsg";
 
 import "../styles.scss";
 
 export default function CreateAccount() {
-  const { account } = useStore();
-  const router = useRouter();
+  const { account, network } = useStore();
   const [secretKey, setSecretKey] = useState("");
+  const [showAlert, setShowAlert] = useState<boolean>(false);
 
+  const queryClient = useQueryClient();
   const IS_TESTING_NETWORK = useIsTestingNetwork();
+  const IS_CUSTOM_NETWORK_WITH_HORIZON =
+    network.id === "custom" && network.horizonUrl;
+
+  const resetQuery = useCallback(
+    () =>
+      queryClient.resetQueries({
+        queryKey: ["friendBot"],
+      }),
+    [queryClient],
+  );
+
+  const resetStates = useCallback(() => {
+    account.reset();
+    resetQuery();
+  }, [resetQuery]);
+
+  const { error, isError, isFetching, isLoading, isSuccess, refetch } =
+    useFriendBot({
+      network,
+      publicKey: account.publicKey!,
+    });
+
+  useEffect(() => {
+    if (isError || isSuccess) {
+      setShowAlert(true);
+    }
+  }, [isError, isSuccess]);
+
+  useEffect(() => {
+    if (
+      account.registeredNetwork?.id &&
+      account.registeredNetwork.id !== network.id
+    ) {
+      resetStates();
+      setShowAlert(false);
+    }
+  }, [account.registeredNetwork, network.id]);
 
   const generateKeypair = () => {
+    resetStates();
+
     const keypair = Keypair.random();
 
-    account.updatePublicKey(keypair.publicKey());
+    if (IS_TESTING_NETWORK) {
+      account.updateKeypair(keypair.publicKey(), keypair.secret());
+    } else {
+      account.updateKeypair(keypair.publicKey());
+    }
+
     setSecretKey(keypair.secret());
   };
 
@@ -43,30 +92,60 @@ export default function CreateAccount() {
             </Text>
           </div>
           <div className="Account__CTA" data-testid="createAccount-buttons">
-            <Button size="md" variant="secondary" onClick={generateKeypair}>
+            <Button
+              disabled={isLoading || isFetching}
+              size="md"
+              variant="secondary"
+              onClick={generateKeypair}
+            >
               Generate keypair
             </Button>
-            {IS_TESTING_NETWORK ? (
+
+            {IS_TESTING_NETWORK || IS_CUSTOM_NETWORK_WITH_HORIZON ? (
               <Button
                 size="md"
+                disabled={!account.publicKey || isLoading}
                 variant="tertiary"
-                onClick={() => router.push(Routes.ACCOUNT_FUND)}
+                isLoading={isLoading || isFetching}
+                onClick={() => {
+                  resetQuery();
+                  refetch();
+                }}
+                data-testid="fundAccount-button"
               >
                 Fund account with Friendbot
               </Button>
             ) : null}
           </div>
 
-          <ExpandBox isExpanded={Boolean(account.publicKey)} offsetTop="xl">
-            <div className="Account__result">
-              <GenerateKeypair
-                publicKey={account.publicKey}
-                secretKey={secretKey}
-              />
-            </div>
-          </ExpandBox>
+          {Boolean(account.publicKey) && (
+            <ExpandBox isExpanded={Boolean(account.publicKey)} offsetTop="xl">
+              <div className="Account__result">
+                <GenerateKeypair
+                  publicKey={account.publicKey}
+                  secretKey={IS_TESTING_NETWORK ? account.secretKey : secretKey}
+                />
+              </div>
+            </ExpandBox>
+          )}
         </div>
       </Card>
+
+      <SuccessMsg
+        publicKey={account.publicKey!}
+        isVisible={Boolean(showAlert && isSuccess && account.publicKey)}
+        onClose={() => {
+          setShowAlert(false);
+        }}
+      />
+
+      <ErrorMsg
+        isVisible={Boolean(showAlert && isError)}
+        errorMsg={error?.message}
+        onClose={() => {
+          setShowAlert(false);
+        }}
+      />
     </div>
   );
 }
diff --git a/src/app/(sidebar)/account/fund/page.tsx b/src/app/(sidebar)/account/fund/page.tsx
index e2c38715..6e98b26f 100644
--- a/src/app/(sidebar)/account/fund/page.tsx
+++ b/src/app/(sidebar)/account/fund/page.tsx
@@ -1,17 +1,19 @@
 "use client";
 
 import { useEffect, useState } from "react";
-import { Alert, Card, Input, Text, Button } from "@stellar/design-system";
+import { Card, Input, Text, Button } from "@stellar/design-system";
 import Link from "next/link";
 import { Routes } from "@/constants/routes";
 
-import { shortenStellarAddress } from "@/helpers/shortenStellarAddress";
 import { useIsTestingNetwork } from "@/hooks/useIsTestingNetwork";
 import { useFriendBot } from "@/query/useFriendBot";
 import { useStore } from "@/store/useStore";
 
 import { validate } from "@/validate";
 
+import { SuccessMsg } from "@/components/FriendBot/SuccessMsg";
+import { ErrorMsg } from "@/components/FriendBot/ErrorMsg";
+
 import "../styles.scss";
 
 export default function FundAccount() {
@@ -23,11 +25,28 @@ export default function FundAccount() {
 
   const IS_TESTING_NETWORK = useIsTestingNetwork();
 
-  const { error, isError, isLoading, isSuccess, refetch, isFetchedAfterMount } =
-    useFriendBot({
-      network: network.id,
-      publicKey: generatedPublicKey,
-    });
+  const {
+    error,
+    isError,
+    isFetching,
+    isLoading,
+    isSuccess,
+    refetch,
+    isFetchedAfterMount,
+  } = useFriendBot({
+    network,
+    publicKey: generatedPublicKey,
+  });
+
+  useEffect(() => {
+    if (
+      account.registeredNetwork?.id &&
+      account.registeredNetwork.id !== network.id
+    ) {
+      account.reset();
+      setShowAlert(false);
+    }
+  }, [account.registeredNetwork, network.id]);
 
   useEffect(() => {
     if (isError || isSuccess) {
@@ -60,13 +79,12 @@ export default function FundAccount() {
           </div>
 
           <Input
-            id="generate-keypair-publickey"
+            id="fund-public-key-input"
             fieldSize="md"
             label="Public Key"
             value={generatedPublicKey}
             onChange={(e) => {
               setGeneratedPublicKey(e.target.value);
-
               const error = validate.publicKey(e.target.value);
               setInlineErrorMessage(error || "");
             }}
@@ -78,8 +96,8 @@ export default function FundAccount() {
             <Button
               disabled={!generatedPublicKey || Boolean(inlineErrorMessage)}
               size="md"
-              variant={isFetchedAfterMount && isError ? "error" : "secondary"}
-              isLoading={isLoading}
+              variant="secondary"
+              isLoading={isLoading || isFetching}
               onClick={() => {
                 if (!inlineErrorMessage) {
                   refetch();
@@ -90,12 +108,12 @@ export default function FundAccount() {
             </Button>
 
             <Button
-              disabled={!account.publicKey || isLoading}
+              disabled={!account.publicKey || isLoading || isFetching}
               size="md"
               variant="tertiary"
               onClick={() => {
                 setInlineErrorMessage("");
-                setGeneratedPublicKey(account.publicKey);
+                setGeneratedPublicKey(account.publicKey!);
               }}
             >
               Fill in with generated key
@@ -104,33 +122,21 @@ export default function FundAccount() {
         </div>
       </Card>
 
-      {showAlert && isFetchedAfterMount && isSuccess && (
-        <Alert
-          placement="inline"
-          variant="primary"
-          actionLabel="View on stellar.expert"
-          actionLink={`https://stellar.expert/explorer/${network.id}/account/${account.publicKey}`}
-          onClose={() => {
-            setShowAlert(false);
-          }}
-          title={`Successfully funded ${shortenStellarAddress(account.publicKey)} on 
-          ${network.id}`}
-        >
-          {""}
-        </Alert>
-      )}
-      {showAlert && isFetchedAfterMount && isError && (
-        <Alert
-          placement="inline"
-          variant="error"
-          onClose={() => {
-            setShowAlert(false);
-          }}
-          title={error?.message}
-        >
-          {""}
-        </Alert>
-      )}
+      <SuccessMsg
+        isVisible={Boolean(showAlert && isFetchedAfterMount && isSuccess)}
+        publicKey={generatedPublicKey}
+        onClose={() => {
+          setShowAlert(false);
+        }}
+      />
+
+      <ErrorMsg
+        isVisible={Boolean(showAlert && isFetchedAfterMount && isError)}
+        errorMsg={error?.message}
+        onClose={() => {
+          setShowAlert(false);
+        }}
+      />
     </div>
   );
 }
diff --git a/src/app/(sidebar)/account/layout.tsx b/src/app/(sidebar)/account/layout.tsx
index cb7d5abc..e28d4942 100644
--- a/src/app/(sidebar)/account/layout.tsx
+++ b/src/app/(sidebar)/account/layout.tsx
@@ -16,7 +16,7 @@ export default function AccountTemplate({
         navItems: [
           {
             route: Routes.ACCOUNT_CREATE,
-            label: "Create Account",
+            label: "Create Account Keypair",
           },
           {
             route: Routes.ACCOUNT_FUND,
diff --git a/src/components/FriendBot/ErrorMsg.tsx b/src/components/FriendBot/ErrorMsg.tsx
new file mode 100644
index 00000000..f08d5d31
--- /dev/null
+++ b/src/components/FriendBot/ErrorMsg.tsx
@@ -0,0 +1,21 @@
+import { Alert } from "@stellar/design-system";
+
+export const ErrorMsg = ({
+  onClose,
+  isVisible,
+  errorMsg,
+}: {
+  onClose: () => void | undefined;
+  isVisible: boolean;
+  errorMsg: string | undefined;
+}) =>
+  isVisible ? (
+    <Alert
+      placement="inline"
+      variant="error"
+      onClose={onClose}
+      title={errorMsg}
+    >
+      {""}
+    </Alert>
+  ) : null;
diff --git a/src/components/FriendBot/SuccessMsg.tsx b/src/components/FriendBot/SuccessMsg.tsx
new file mode 100644
index 00000000..6eafc7ae
--- /dev/null
+++ b/src/components/FriendBot/SuccessMsg.tsx
@@ -0,0 +1,39 @@
+import { Alert } from "@stellar/design-system";
+
+import { useStore } from "@/store/useStore";
+
+import { shortenStellarAddress } from "@/helpers/shortenStellarAddress";
+
+export const SuccessMsg = ({
+  onClose,
+  publicKey,
+  isVisible,
+}: {
+  onClose: () => void | undefined;
+  publicKey: string;
+  isVisible: boolean;
+}) => {
+  const { network } = useStore();
+  const IS_STELLAR_EXPERT_ENABLED =
+    network.id === "testnet" || network.id === "mainnet";
+
+  return isVisible ? (
+    <Alert
+      placement="inline"
+      variant="success"
+      actionLabel={
+        IS_STELLAR_EXPERT_ENABLED ? "View on stellar.expert" : undefined
+      }
+      actionLink={
+        IS_STELLAR_EXPERT_ENABLED
+          ? `https://stellar.expert/explorer/${network.id}/account/${publicKey}`
+          : undefined
+      }
+      onClose={onClose}
+      title={`Successfully funded ${shortenStellarAddress(publicKey)} on 
+    ${network.id}`}
+    >
+      {""}
+    </Alert>
+  ) : null;
+};
diff --git a/src/components/GenerateKeypair.tsx b/src/components/GenerateKeypair.tsx
index 1ec63ab8..8e4eb28d 100644
--- a/src/components/GenerateKeypair.tsx
+++ b/src/components/GenerateKeypair.tsx
@@ -4,8 +4,8 @@ export const GenerateKeypair = ({
   publicKey,
   secretKey,
 }: {
-  publicKey: string;
-  secretKey: string;
+  publicKey: string | undefined;
+  secretKey: string | undefined;
 }) => {
   return (
     <div className="Account__keypair">
diff --git a/src/query/useFriendBot.ts b/src/query/useFriendBot.ts
index 6f3d6123..cc49c7d4 100644
--- a/src/query/useFriendBot.ts
+++ b/src/query/useFriendBot.ts
@@ -1,4 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
+import { EmptyObj, Network } from "@/types/types";
 
 import { shortenStellarAddress } from "@/helpers/shortenStellarAddress";
 
@@ -6,32 +7,45 @@ export const useFriendBot = ({
   network,
   publicKey,
 }: {
-  network: string;
+  network: Network | EmptyObj;
   publicKey: string;
 }) => {
-  const friendbotURL =
-    network === "futurenet"
+  const knownFriendbotURL =
+    network.id === "futurenet"
       ? "https://friendbot-futurenet.stellar.org"
       : "https://friendbot.stellar.org";
 
   const query = useQuery({
     queryKey: ["friendBot"],
     queryFn: async () => {
+      if (!network.horizonUrl) {
+        throw new Error(`Please use a network that supports Horizon`);
+      }
+
       try {
-        const response = await fetch(`${friendbotURL}/?addr=${publicKey}`);
+        const url =
+          network.id === "custom"
+            ? `${network.horizonUrl}/friendbot`
+            : `${knownFriendbotURL}/`;
+        const response = await fetch(`${url}?addr=${publicKey}`);
 
         if (!response.ok) {
           const errorBody = await response.json();
 
-          throw new Error(errorBody.status);
+          throw new Error("there was an error", { cause: errorBody });
         }
         return response;
       } catch (e: any) {
-        if (e.status === 0) {
+        if (e.cause.status === 0) {
           throw new Error(`Unable to reach Friendbot server at ${network}`);
+        } else if (e.cause.detail.includes("createAccountAlreadyExist")) {
+          throw new Error(
+            `This account is already funded. Therefore, we are unable to fund ${shortenStellarAddress(publicKey)} on the test network.`,
+          );
         } else {
           throw new Error(
-            `Unable to fund ${shortenStellarAddress(publicKey)} on the test network`,
+            `Unable to fund ${shortenStellarAddress(publicKey)} on the test network. Details: ${e.cause.detail}`,
+            { cause: e },
           );
         }
       }
diff --git a/src/store/createStore.ts b/src/store/createStore.ts
index 950538df..6d35d495 100644
--- a/src/store/createStore.ts
+++ b/src/store/createStore.ts
@@ -13,12 +13,14 @@ export interface Store {
 
   // Account
   account: {
-    publicKey: string;
+    publicKey: string | undefined;
+    secretKey: string | undefined;
+    registeredNetwork: Network | EmptyObj;
     generatedMuxedAccountInput: Partial<MuxedAccount> | EmptyObj;
     parsedMuxedAccountInput: string | undefined;
     generatedMuxedAccount: MuxedAccount | EmptyObj;
     parsedMuxedAccount: MuxedAccount | EmptyObj;
-    updatePublicKey: (value: string) => void;
+    updateKeypair: (publicKey: string, secretKey?: string) => void;
     updateGeneratedMuxedAccountInput: (value: Partial<MuxedAccount>) => void;
     updateParsedMuxedAccountInput: (value: string) => void;
     updateGeneratedMuxedAccount: (value: MuxedAccount) => void;
@@ -75,6 +77,16 @@ const initTransactionState = {
   },
 };
 
+const initAccountState = {
+  publicKey: undefined,
+  secretKey: undefined,
+  registeredNetwork: {},
+  generatedMuxedAccountInput: {},
+  parsedMuxedAccountInput: undefined,
+  generatedMuxedAccount: {},
+  parsedMuxedAccount: {},
+};
+
 // Store
 export const createStore = (options: CreateStoreOptions) =>
   create<Store>()(
@@ -97,11 +109,7 @@ export const createStore = (options: CreateStoreOptions) =>
           }),
         // Account
         account: {
-          publicKey: "",
-          generatedMuxedAccountInput: {},
-          parsedMuxedAccountInput: undefined,
-          generatedMuxedAccount: {},
-          parsedMuxedAccount: {},
+          ...initAccountState,
           updateGeneratedMuxedAccountInput: (value: Partial<MuxedAccount>) =>
             set((state) => {
               state.account.generatedMuxedAccountInput = {
@@ -127,13 +135,15 @@ export const createStore = (options: CreateStoreOptions) =>
                 ...value,
               };
             }),
-          updatePublicKey: (value: string) =>
+          updateKeypair: (publicKey: string, secretKey?: string) =>
             set((state) => {
-              state.account.publicKey = value;
+              state.account.publicKey = publicKey;
+              state.account.secretKey = secretKey || "";
+              state.account.registeredNetwork = state.network;
             }),
           reset: () =>
             set((state) => {
-              state.account.publicKey = "";
+              state.account = { ...state.account, ...initAccountState };
             }),
         },
         // Endpoints
diff --git a/tests/createAccountPage.test.ts b/tests/createAccountPage.test.ts
index e85ae724..9d4f4877 100644
--- a/tests/createAccountPage.test.ts
+++ b/tests/createAccountPage.test.ts
@@ -29,11 +29,42 @@ test.describe("Create Account Page", () => {
     ).toHaveValue(/^S/);
   });
 
-  test("Test 'Fund account' button", async ({ page }) => {
-    await page
-      .getByRole("button", { name: "Fund account with Friendbot" })
-      .click();
+  test("Successfully funds an account when clicking 'Fund account' with a valid public key", async ({
+    page,
+  }) => {
+    await page.getByRole("button", { name: "Generate keypair" }).click();
+
+    const fundButton = page
+      .getByTestId("fundAccount-button")
+      .getByText("Fund account with Friendbot");
+
+    await expect(fundButton).toBeEnabled();
+
+    // Mock the friendbot api call
+    await page.route(
+      "*/**/?addr=GA4X4QMSTEUKWAXXX3TBFRMGWI3O5X5IUUHPKAIH5XKNQ4IBTQ6YSVV3",
+      async (route) => {
+        await route.fulfill({
+          status: 200,
+          contentType: "application/json",
+          body: JSON.stringify({}),
+        });
+      },
+    );
+
+    // Ensure the listener is set up before the action that triggers the request
+    const responsePromise = page.waitForResponse(
+      (response) =>
+        response.url().includes("?addr=") && response.status() === 200,
+    );
+
+    await fundButton.click();
+
+    // Wait for the mocked response
+    await responsePromise;
 
-    await expect(page).toHaveURL(/.*\/account\/fund/);
+    // Success <Alert/> is visible
+    const alertBox = page.getByText(/Successfully funded/);
+    await expect(alertBox).toBeVisible();
   });
 });
diff --git a/tests/fundAccountPage.test.ts b/tests/fundAccountPage.test.ts
index ff3cdb5f..56c16ae8 100644
--- a/tests/fundAccountPage.test.ts
+++ b/tests/fundAccountPage.test.ts
@@ -49,7 +49,7 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
   test("By default, 'Public Key' input field is empty and buttons are disabled", async ({
     page,
   }) => {
-    await expect(page.locator("#generate-keypair-publickey")).toHaveValue("");
+    await expect(page.locator("#fund-public-key-input")).toHaveValue("");
 
     const getLumenButton = page
       .getByTestId("fundAccount-buttons")
@@ -65,7 +65,7 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
   test("Gets an error with an invalid public key in 'Public Key' field", async ({
     page,
   }) => {
-    const publicKeyInput = page.locator("#generate-keypair-publickey");
+    const publicKeyInput = page.locator("#fund-public-key-input");
 
     // Type in an invalid string in 'Public Key' input field
     await publicKeyInput.fill("XLKDSFJLSKDJF");
@@ -79,28 +79,25 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
   test("Successfully funds an account when clicking 'Get lumens' with a valid public key", async ({
     page,
   }) => {
-    // Get a new public key
-    const publicKey =
-      "GDVOT2ALMUF3G54RBHNJUEV6LOAZCQQCARHEVNUPKGMVPWFC4PFN33QR";
-    const publicKeyInput = page.locator("#generate-keypair-publickey");
+    const publicKeyInput = page.locator("#fund-public-key-input");
     const getLumenButton = page
       .getByTestId("fundAccount-buttons")
       .getByText("Get lumens");
 
-    // Type in an invalid string in 'Public Key' input field
-    await publicKeyInput.fill(publicKey);
+    await publicKeyInput.fill(
+      "GB6D5E2HRVBD6QIOXCE6ILMUFQT45LMSZSKRZUCL4ZK6Q6GCNMTJ2E3C",
+    );
 
     await expect(publicKeyInput).toHaveAttribute("aria-invalid", "false");
     await expect(getLumenButton).toBeEnabled();
 
     // Mock the friendbot api call
     await page.route(
-      "*/**/?addr=GDVOT2ALMUF3G54RBHNJUEV6LOAZCQQCARHEVNUPKGMVPWFC4PFN33QR",
+      "*/**/?addr=GB6D5E2HRVBD6QIOXCE6ILMUFQT45LMSZSKRZUCL4ZK6Q6GCNMTJ2E3C",
       async (route) => {
         await route.fulfill({
           status: 200,
-          contentType: "application/json",
-          body: JSON.stringify({}),
+          contentType: "application/hal+json",
         });
       },
     );
@@ -113,10 +110,8 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
 
     await getLumenButton.click();
 
-    // Wait for the mocked response
     await responsePromise;
 
-    // Success <Alert/> is visible
     const alertBox = page.getByText(/Successfully funded/);
     await expect(alertBox).toBeVisible();
   });
@@ -124,7 +119,7 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
   test("Gets an error when submitting 'Get lumens' with a public key that's already been funded", async ({
     page,
   }) => {
-    const publicKeyInput = page.locator("#generate-keypair-publickey");
+    const publicKeyInput = page.locator("#fund-public-key-input");
     const getLumenButton = page
       .getByTestId("fundAccount-buttons")
       .getByText("Get lumens");
@@ -139,12 +134,12 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
 
     // Mock the friendbot api call
     await page.route(
-      "*/**/?addr=GDVOT2ALMUF3G54RBHNJUEV6LOAZCQQCARHEVNUPKGMVPWFC4PFN33QR",
+      "*/**/?addr=GBX6W44ISK6XTBDDJ5ND6KTJHLYEYHMR4SDG635NRARYVJ3G2YXGDT6Y",
       async (route) => {
         await route.fulfill({
           status: 400,
-          contentType: "application/json",
-          body: JSON.stringify({}),
+          contentType: "application/problem+json",
+          body: JSON.stringify({ detail: "createAccountAlreadyExist" }),
         });
       },
     );
@@ -159,7 +154,7 @@ test.describe("[futurenet/testnet] Fund Account Page", () => {
 
     await responsePromise;
 
-    const alertBox = page.getByText(/Unable to fund/);
+    const alertBox = page.getByText(/This account is already funded/);
     await expect(alertBox).toBeVisible();
   });