I agree, a self service unlock function or a configurable unlock time period, would also be helpful.