Made changes for users, admins and user settings