diff --git a/helpers/hardhat-constants.ts b/helpers/hardhat-constants.ts
index a9f441e1..35ed34f3 100644
--- a/helpers/hardhat-constants.ts
+++ b/helpers/hardhat-constants.ts
@@ -155,7 +155,7 @@ export const BROWSER_URLS = {
 };
 
 export const DEPLOY_START = parseInt(process.env.DEPLOY_START || "0");
-export const DEPLOY_END = parseInt(process.env.DEPLOY_END || "24");
+export const DEPLOY_END = parseInt(process.env.DEPLOY_END || "25");
 export const DEPLOY_INCREMENTAL =
   process.env.DEPLOY_INCREMENTAL == "true" ? true : false;
 
diff --git a/scripts/deployments/steps/24_accountAbstraction.ts b/scripts/deployments/steps/24_accountAbstraction.ts
index 724c1f52..53dd1eb8 100644
--- a/scripts/deployments/steps/24_accountAbstraction.ts
+++ b/scripts/deployments/steps/24_accountAbstraction.ts
@@ -3,7 +3,6 @@ import {
   deployAccountFactory,
   deployAccountRegistry,
   deployAccountRegistryProxy,
-  deployInitializableImmutableAdminUpgradeabilityProxy,
 } from "../../../helpers/contracts-deployments";
 import {getFirstSigner} from "../../../helpers/contracts-getters";
 import {getParaSpaceConfig, isLocalTestnet} from "../../../helpers/misc-utils";
@@ -28,9 +27,8 @@ export const step_24 = async (verify = false) => {
       );
 
       const accountRegistryProxy = await deployAccountRegistryProxy(
-        paraSpaceConfig.ParaSpaceAdmin
-          ? paraSpaceConfig.ParaSpaceAdmin
-          : await (await getFirstSigner()).getAddress(),
+        paraSpaceConfig.ParaSpaceAdmin ||
+          (await (await getFirstSigner()).getAddress()),
         accountRegistry.address,
         verify
       );
diff --git a/scripts/deployments/steps/index.ts b/scripts/deployments/steps/index.ts
index a75d3afe..15fdde3c 100644
--- a/scripts/deployments/steps/index.ts
+++ b/scripts/deployments/steps/index.ts
@@ -23,6 +23,7 @@ export const getAllSteps = async () => {
   const {step_21} = await import("./21_helperContract");
   const {step_22} = await import("./22_timelock");
   const {step_23} = await import("./23_renounceOwnership");
+  const {step_24} = await import("./24_accountAbstraction");
 
   return [
     step_00,
@@ -49,5 +50,6 @@ export const getAllSteps = async () => {
     step_21,
     step_22,
     step_23,
+    step_24,
   ];
 };