Phase 12 of authentication implementation - partial merged implementation