Made addUser and removeUser helpers use the new 2.6 commands when applicable