Attach correct username after email change