fixed name collision with admin users