Improved @user completion once more