Fixing facebook and non-facebook login issues