Additional support for trial users and students

Additional support for trial users and students