Minor fix on USER checking