Server - improved users router to be more maintainable