Update UserX, with back compatibility