Fix null user suffix