Fix admin user management bugs