Clean up canAdminister code; permit self-administration