Improved @user completion