Reworked authentication chain