#21264354030756: Fix for Change Password scenario and refactor to encapsulate spring static methods.