move idtoken related message to initial call