Fixes S::user() for non-hruid branches.