Attempt to fix issue with FB login.
Merge branch 'HotFix_Login' into aws_production