@user parsing fix