Handle switch from external_login token to username token - attempt to merge uesrs, prompting if necessary #51