Updated WelcomeFramework and ChangePassword