fb auth fixup - 3 - mostly fixed

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>