Mary,
Just letting you know I have sorted the issue based on your suggestion. The only issue I had was adding all 800+ users to the 'Assign Roles' dialogue because of the 100 user limit (think this is well documented). Finally manage to add everyone via a convoluted method of searching, but it's done now and seems to be working fine.
Thanks everyone for all of your help and suggestions