Fixes to account sign up/chooser process including social options

Also renamed some classes.