diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Support.java b/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
index 172f264d9..1b880e99a 100644
--- a/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
@@ -9,7 +9,7 @@ import java.util.Map;
 
 /**
  * <p> Provide an Edit method for retrieving an existing subscription, and a
- * Save method for updating or inserting a subscription. </p>
+ * Update method for updating or inserting a subscription. </p>
  */
 public class Support extends MailreaderSupport
         implements Preparable {
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Update.java b/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
index e24e53070..2c77f82c0 100644
--- a/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
@@ -5,7 +5,7 @@ import mailreader2.Constants;
 /**
  * <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
  */
-public final class Save extends Edit {
+public final class Update extends Edit {
 
     public void prepare() {
         super.prepare();
diff --git a/apps/mailreader/src/main/java/struts.xml b/apps/mailreader/src/main/java/struts.xml
index a2ab18282..4e7a8e15c 100644
--- a/apps/mailreader/src/main/java/struts.xml
+++ b/apps/mailreader/src/main/java/struts.xml
@@ -26,7 +26,7 @@
 
         <!-- goto actions: Exit to another workflow -->
 
-        <action name="subscription/Save" class="mailreader2.subscription.Save">
+        <action name="subscription/Save" class="mailreader2.subscription.Update">
             <result name="input">/pages/subscription.jsp</result>
             <result type="redirect-action">registration/+Input</result>
         </action>
@@ -43,7 +43,7 @@
             <result>/pages/{1}.jsp</result>
         </action>
 
-        <!-- execute actions: Create, Retrieve, Update, Save -->
+        <!-- execute actions: Create, Retrieve, Update, Update -->
 
         <action name="*/*" class="mailreader2.{1}.{2}">
             <result name="input">/pages/{1}.jsp</result>
diff --git a/apps/mailreader/src/main/webapp/pages/logon.jsp b/apps/mailreader/src/main/webapp/pages/logon.jsp
index 92bbae477..1f210d68f 100644
--- a/apps/mailreader/src/main/webapp/pages/logon.jsp
+++ b/apps/mailreader/src/main/webapp/pages/logon.jsp
@@ -9,10 +9,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.Retrieve.username.focus()">
+<body onLoad="self.focus();document.logon_Retrieve.logon_Retrieve_username.focus()">
 
 <s:actionerror/>
-<s:form id="Retrieve" action="logon/Retrieve" validate="true">
+<s:form id="logon_Retrieve" action="logon/Retrieve" validate="true">
     <s:textfield label="%{getText('username')}" name="username"/>
 
     <s:password label="%{getText('password')}" name="password" showPassword="true"/>
diff --git a/apps/mailreader/src/main/webapp/pages/registration.jsp b/apps/mailreader/src/main/webapp/pages/registration.jsp
index af263d95e..c8bd45a14 100644
--- a/apps/mailreader/src/main/webapp/pages/registration.jsp
+++ b/apps/mailreader/src/main/webapp/pages/registration.jsp
@@ -14,10 +14,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.form1.username.focus()">
+<body onLoad="self.focus();document.registration_Update.registration_Update_username.focus()">
 
 <s:actionerror/>
-<s:form id="form1" action="registration/Update" validate="true">
+<s:form id="registration_Update" action="registration/Update" validate="true">
     <s:token/>
     <s:hidden name="task"/>
     <s:if test="task == 'Create'">
diff --git a/apps/mailreader/src/main/webapp/pages/subscription.jsp b/apps/mailreader/src/main/webapp/pages/subscription.jsp
index 536e732e3..adac06dbf 100644
--- a/apps/mailreader/src/main/webapp/pages/subscription.jsp
+++ b/apps/mailreader/src/main/webapp/pages/subscription.jsp
@@ -17,10 +17,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.form1.username.focus()">
+<body onLoad="self.focus();document.subscription_Update.subscription_Update_username.focus()">
 
 <s:actionerror/>
-<s:form id="form1" action="subscription/Save" validate="true">
+<s:form id="subscription_Update" action="subscription/Update" validate="true">
     <s:token/>
     <s:hidden name="task"/>
     <s:label label="%{getText('username')}" name="user.username"/>
diff --git a/apps/mailreader/src/test/java/mailreader2/ConfigTest.java b/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
index db450b4bf..abe1127f7 100644
--- a/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
+++ b/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
@@ -39,7 +39,7 @@ public class ConfigTest extends XWorkTestCase {
     }
 
     public void testSubscriptionSave() throws Exception {
-        ActionConfig config = assertClass("subscription/Save", "mailreader2.subscription.Save");
+        ActionConfig config = assertClass("subscription/Update", "mailreader2.subscription.Update");
         assertResult(config, ActionSupport.SUCCESS, "registration/+Input");
         assertResult(config, ActionSupport.INPUT, "/pages/subscription.jsp");
     }
