diff --git a/packages/keychain/src/components/connect/Signup/Argent.tsx b/packages/keychain/src/components/connect/Signup/Argent.tsx
index 314f98ede..74bb2bc3d 100644
--- a/packages/keychain/src/components/connect/Signup/Argent.tsx
+++ b/packages/keychain/src/components/connect/Signup/Argent.tsx
@@ -149,21 +149,9 @@ function SignupArgentInner({ username }: { username: string }) {
       const buffer = base64url.toBuffer(challenge);
       const high = "0x" + buffer.subarray(0, 16).toString("hex");
       const low = "0x" + buffer.subarray(16, 32).toString("hex");
-      console.log({ high, low });
-      console.log({ challenge: "0x" + buffer.toString("hex") });
-
       const typedData = registerTypedData(username, { low, high }, chainId);
-
-      const hash = await extAccount.hashMessage(typedData);
-      console.log({ hash });
-
       const sig = await extAccount.signMessage(typedData);
-      const finalizeMutation = await finalizeAccountSignup(
-        extAccount.address,
-        chainId,
-        sig as string[],
-      );
-      console.log({ finalizeMutation });
+      await finalizeAccountSignup(extAccount.address, chainId, sig as string[]);
 
       // set controller address & calldata
       const salt = shortString.encodeShortString(username);
@@ -283,7 +271,7 @@ function SignupArgentInner({ username }: { username: string }) {
         break;
       }
     }
-  });
+  }, [state, username, setTitle]);
 
   return (
     <Container
@@ -419,9 +407,8 @@ function SignupArgentInner({ username }: { username: string }) {
               <Button
                 colorScheme="colorful"
                 onClick={() => {
-
                   console.log("deploy");
-                  onDeploy()
+                  onDeploy();
                 }}
                 isLoading={isDeploying}
                 isDisabled={!(isAllFunded && isChecked && extAccount)}
@@ -455,7 +442,7 @@ function ExternalWalletProvider({ children }: PropsWithChildren) {
 function useTokens() {
   const { account: extAccount } = useAccount();
   const { provider } = useProvider();
-  const { controller, prefunds } = useConnection();
+  const { prefunds } = useConnection();
   const [tokens, setTokens] = useState<TokenInfo[]>([]);
   const [isChecked, setIsChecked] = useState(false);
   const [isFetching, setIsFetching] = useState(true);
@@ -476,7 +463,7 @@ function useTokens() {
     if (!isChecked) {
       setIsChecked(true);
     }
-  }, [tokens, controller, isChecked, extAccount?.address, provider]);
+  }, [tokens, isChecked, extAccount?.address, provider]);
 
   useInterval(checkFunds, 3000);
 
diff --git a/packages/keychain/src/components/connect/Signup/index.tsx b/packages/keychain/src/components/connect/Signup/index.tsx
index 9799d2a8e..1006ebb51 100644
--- a/packages/keychain/src/components/connect/Signup/index.tsx
+++ b/packages/keychain/src/components/connect/Signup/index.tsx
@@ -32,7 +32,6 @@ export function Signup({
 }: SignupProps) {
   const theme = useControllerTheme();
   const { chainId, rpcUrl, setController } = useConnection();
-  console.log({ chainId, rpcUrl });
   const [error, setError] = useState<Error>();
   const [isRegistering, setIsRegistering] = useState(false);
   const [isPopup, setIsPopup] = useState(false);
@@ -242,22 +241,23 @@ export function Signup({
             >
               sign up
             </Button>
-            {document.cookie.includes("argent") && (
-              // {typeof window !== "undefined" && window["starknet_argentX"] && (
-              <Button
-                colorScheme="colorful"
-                isLoading={isRegistering}
-                isDisabled={
-                  debouncing ||
-                  !username ||
-                  isValidating ||
-                  !!usernameField.error
-                }
-                onClick={() => setSignupMethod(SignupMethod.ARGENT)}
-              >
-                <ArgentIcon />
-              </Button>
-            )}
+            {typeof window !== "undefined" &&
+              window["starknet_argentX"] &&
+              window.document.cookie.includes("argent") && (
+                <Button
+                  colorScheme="colorful"
+                  isLoading={isRegistering}
+                  isDisabled={
+                    debouncing ||
+                    !username ||
+                    isValidating ||
+                    !!usernameField.error
+                  }
+                  onClick={() => setSignupMethod(SignupMethod.ARGENT)}
+                >
+                  <ArgentIcon />
+                </Button>
+              )}
           </HStack>
           <RegistrationLink
             description="Already have a Controller?"