fix resolveuser references