more work on cleaning up the FB login logic