Initial work on identifing accounts via ID instead of email