Fix USERS / SERVERS definition