On email address change second confirm fails due to email customization

I removed my Google auth in case that was part of the issue. For repro I recorded this 94 second screencast of my steps:

https://drive.google.com/file/d/1eOE2Tptvyk2daWkvDYEFXY3qNKgnImPA/view