Added user check in & updated User selection for routes