Refactored user routes part 1 of 2

need to omit salt too