#11, make sure users get directed the right way