basic affiliate user improvements separations +++