Update sign-in sign-out callbacks, simplified