Added more rigorous validation on authentication
Changed auth to new join scheme