final facebook login changes before merge