More tweaking, require email from social provider.