DEV-20231 authorization fix