diff --git a/src/components/users/forms/profile-form.tsx b/src/components/users/forms/profile-form.tsx
index 12b8d5e..f77d1ad 100644
--- a/src/components/users/forms/profile-form.tsx
+++ b/src/components/users/forms/profile-form.tsx
@@ -58,7 +58,8 @@ export const ProfileForm = (props: ProfileFormProps) => {
         const result = await utils.client.user.getAddressBySearchTerm.query({
           searchTerm: data.vpa,
         });
-        if (result?.blockchain_address) {
+        // TODO Fix this check
+        if (result?.blockchain_address && data.vpa !== props.initialValues.vpa) {
           form.setError("vpa", {
             type: "manual",
             message: "VPA already exists",