#4137 Auth Manager rework