Attach correct username after email change
Attach correct username after email change