Implemented locking, with no email sent