RPP refactor: Forgot/Change password reworked/optimized