82,83c82
<     public void doPerform(RunData rundata) throws Exception
<     {
---
> 	
85c84,88
<         String cancelBtn = rundata.getParameters().getString(Localization.getString("PASSWORDFORM_CANCEL"));
---
> 	/**
> 	 * @see org.apache.turbine.modules.Action#doPerform(RunData)
> 	 */
> 	public void doPerform(RunData rundata) throws Exception {
>         String cancelBtn = rundata.getParameters().getString(Localization.getString("PASSWORDFORM_CANCEL",rundata.getRequest().getLocale()));
95c98
<         if (cancelBtn != null && cancelBtn.equalsIgnoreCase(Localization.getString("PASSWORDFORM_CANCEL")))
---
>         if (cancelBtn != null && cancelBtn.equalsIgnoreCase(Localization.getString("PASSWORDFORM_CANCEL",rundata.getRequest().getLocale())))
109c112
<                 rundata.setMessage(Localization.getString("UPDATEACCOUNT_PWNOTMATCH"));
---
>                 rundata.setMessage(Localization.getString("UPDATEACCOUNT_PWNOTMATCH",rundata.getRequest().getLocale()));
116c119
<                 rundata.setMessage(Localization.getString("PASSWORDFORM_THESAME_MSG"));
---
>                 rundata.setMessage(Localization.getString("PASSWORDFORM_THESAME_MSG",rundata.getRequest().getLocale()));
123c126
<             rundata.setMessage(Localization.getString("PASSWORDFORM_DONE"));
---
>             rundata.setMessage(Localization.getString("PASSWORDFORM_DONE",rundata.getRequest().getLocale()));
125,141d127
<             // Login again
<             rundata.getParameters().setString("username", username);
<             rundata.getParameters().setString("password", password);
<             String userRequestsRememberMe = rundata.getParameters().getString("rememberme");
<             rundata.getParameters().setString("rememberme", userRequestsRememberMe);
<             ActionLoader.getInstance().getInstance(
<                 JetspeedResources.getString(TurbineConstants.ACTION_LOGIN)
<                 ).doPerform(rundata);
< 
< 
<             // Update the profile in rundata - not sure why this is not happening automatically?
<             JetspeedRunData jdata = (JetspeedRunData) rundata;
<             ProfileLocator locator = Profiler.createLocator();
<             locator.setUser(user);
<             Profile profile = Profiler.getProfile(locator);
<             jdata.setProfile(profile);
< 
151c137
< }
---
> }
\ No newline at end of file