when the door was glazed was it toe and heeled properly ? if not this can cause your door leaf to drop so the lock may not be lining up because of this.
it may be worth de-glazing and putting some packers into the top of the door to lift the leaf.
hope this helps?