fixed the double account creation when a user logins in socially
Merge branch 'edge'