Fixed issue with Facebook login.
Merge branch 'HotFix_Login' into aws_production