Feature/user route fix