Fixes and made social_token field nullable