Enabling social logins

Removing hacks and using identity helpers.