Add nick override and nick lock