AAA-180: Fix Dynamic authorization