Refactoring and moving of User Password