AID-599: Different redirect logic