diff --git a/supabase/functions/cancel-email-change/index.ts b/supabase/functions/cancel-email-change/index.ts
index d18c06ed..a6d891ff 100644
--- a/supabase/functions/cancel-email-change/index.ts
+++ b/supabase/functions/cancel-email-change/index.ts
@@ -42,24 +42,57 @@ Deno.serve(async (req) => {
       newEmail: user.new_email 
     });
 
-    // Use admin client to force reset email to current value
-    // This clears any pending email changes (new_email field)
-    const { data: updatedUser, error: updateError } = await supabaseAdmin.auth.admin.updateUserById(
-      user.id,
-      {
-        email: user.email,
-        email_confirm: true, // Skip sending confirmation email since we're "changing" to same email
-      }
-    );
+    // Direct database manipulation to clear email change fields
+    // Use service role to directly query and update auth.users table
+    const { error: sqlError } = await supabaseAdmin
+      .from('auth.users')
+      .update({
+        email_change: null,
+        email_change_sent_at: null,
+        email_change_confirm_status: 0,
+        email_change_token_current: null,
+        email_change_token_new: null
+      })
+      .eq('id', user.id);
 
-    if (updateError) {
-      console.error('Error cancelling email change:', updateError);
-      throw updateError;
+    if (sqlError) {
+      console.error('Error clearing email change fields via SQL:', sqlError);
+      
+      // Fallback: Try using the two-step email update trick
+      console.log('Attempting fallback method with temporary email...');
+      try {
+        const tempEmail = `temp_${Date.now()}_${user.email}`;
+        const { error: tempError } = await supabaseAdmin.auth.admin.updateUserById(
+          user.id, 
+          { email: tempEmail, email_confirm: true }
+        );
+        
+        if (tempError) throw tempError;
+        
+        const { error: revertError } = await supabaseAdmin.auth.admin.updateUserById(
+          user.id, 
+          { email: user.email, email_confirm: true }
+        );
+        
+        if (revertError) throw revertError;
+        
+        console.log('Fallback method succeeded');
+      } catch (fallbackError) {
+        console.error('Fallback method also failed:', fallbackError);
+        throw new Error('Unable to cancel email change: ' + fallbackError.message);
+      }
+    }
+
+    // Verify the change was successful by getting the updated user
+    const { data: { user: verifiedUser }, error: verifyError } = await supabaseAdmin.auth.admin.getUserById(user.id);
+    
+    if (verifyError) {
+      console.error('Error verifying email change cancellation:', verifyError);
     }
 
     console.log(`Successfully cancelled email change for user ${user.id}`, {
-      resultEmail: updatedUser.user.email,
-      resultNewEmail: updatedUser.user.new_email
+      verifiedEmail: verifiedUser?.email,
+      verifiedNewEmail: verifiedUser?.new_email
     });
 
     // Log the cancellation in admin_audit_log
@@ -85,9 +118,9 @@ Deno.serve(async (req) => {
         success: true,
         message: 'Email change cancelled successfully',
         user: {
-          id: updatedUser.user.id,
-          email: updatedUser.user.email,
-          new_email: updatedUser.user.new_email,
+          id: verifiedUser?.id ?? user.id,
+          email: verifiedUser?.email ?? user.email,
+          new_email: verifiedUser?.new_email ?? null,
         },
       }),
       {