some fixes for excluded users, and admin function fixes