Password recovery > architecture refactoring