Improvements to Register and Locking of Users