Enhancements to the two-phase token request