diff --git a/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx b/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx
index a557df2ab4..79aa72295f 100644
--- a/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx
+++ b/client/src/app/pages/identities/components/identity-form/__tests__/identity-form.test.tsx
@@ -166,15 +166,6 @@ describe("Component: identity-form", () => {
 
     expect(passwordInput).toHaveValue("password");
     expect(createButton).toBeEnabled();
-
-    // focus off password then focus back on should 1. clear the password and 2. disable the create button
-    await waitFor(() => {
-      fireEvent.focus(createButton);
-      fireEvent.focus(passwordInput);
-    });
-
-    expect(passwordInput).toHaveValue("");
-    expect(createButton).toBeDisabled();
   });
 
   it.skip("Identity form validation test - source - key upload", async () => {
@@ -326,14 +317,5 @@ describe("Component: identity-form", () => {
     const createButton = screen.getByRole("button", { name: /submit/i });
 
     expect(createButton).toBeEnabled();
-
-    // focus off password then focus back on should 1. clear the password and 2. disable the create button
-    await waitFor(() => {
-      fireEvent.focus(createButton);
-      fireEvent.focus(proxyPasswordInput);
-    });
-
-    expect(proxyPasswordInput).toHaveValue("");
-    expect(createButton).toBeDisabled();
   });
 });
diff --git a/client/src/app/pages/identities/components/identity-form/identity-form.tsx b/client/src/app/pages/identities/components/identity-form/identity-form.tsx
index 33ad84a30c..9ab6d9f4b7 100644
--- a/client/src/app/pages/identities/components/identity-form/identity-form.tsx
+++ b/client/src/app/pages/identities/components/identity-form/identity-form.tsx
@@ -540,7 +540,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
                   ) : undefined,
                 }}
                 type={isPasswordHidden ? "password" : "text"}
-                onFocus={() => resetField("password")}
               />
             </>
           )}
@@ -611,7 +610,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
                     />
                   ) : undefined,
                 }}
-                onFocus={() => resetField("password")}
               />
             </>
           )}
@@ -701,7 +699,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
                 />
               ) : undefined,
             }}
-            onFocus={() => resetField("password")}
           />
         </>
       )}
@@ -725,7 +722,6 @@ export const IdentityForm: React.FC<IdentityFormProps> = ({
                 />
               ) : undefined,
             }}
-            onFocus={() => resetField("key")}
           />
         </>
       )}