B: removed autoresolve stuff and replaced user name resolution