User routing fix