Fixed issue with username and social login