Bug Fix on workaround for Facebook login