Try to DTRT for mixed usage of Initiators and Auth users

Ticket:	#6411