Logic issue in email change process

Summary

Same issue as #266017, however due to a clerical error, report #266017 was processed first, awarded a bounty, and closed as Resolved. It is therefore only fair to award the same bounty to @gujjuboy10x00 and close this report as Resolved. @gujjuboy10x00, we apologize for the error and have awarded a bonus for our mistake.