--- loncom/interface/lonpreferences.pm	2009/10/08 21:15:19	1.125.4.6
+++ loncom/interface/lonpreferences.pm	2009/09/23 15:12:54	1.125.8.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.4.6 2009/10/08 21:15:19 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.8.1 2009/09/23 15:12:54 gci Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1290,8 +1290,6 @@ sub jscript_send {
                    this.document.client.elements.uname.value;
         this.document.pserver.elements.udom.value =
                    this.document.client.elements.udom.options[this.document.client.elements.udom.selectedIndex].value;
-        this.document.pserver.elements.email.value =
-                   this.document.client.elements.email.value;
 |;
     }
     $ output .= qq|
@@ -1374,7 +1372,6 @@ sub server_form {
 <input type="hidden" name="token"   value="$mailtoken" />
 <input type="hidden" name="uname"   value="" />
 <input type="hidden" name="udom"   value="" />
-<input type="hidden" name="email"   value="" />
 
 |;
     }
@@ -1527,17 +1524,14 @@ ENDERROR
         }
     } else {
 	# error error: run in circles, scream and shout
+        $message = &Apache::lonhtmlcommon::confirm_success(
+                   &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
         if ($caller eq 'reset_by_email') {
-            if (!$result) {
-                return 1;
-            } else {
-                return $result;
-            }
+            $r->print($message.'<br />');
         } else {
-            $message = &Apache::lonhtmlcommon::confirm_success(
-                &mt("The password for user [_1] was not changed.",'<i>'.$user.'</i>').' '.&mt('Please make sure your old password was entered correctly.'),1);
             $r->print(&Apache::loncommon::confirmwrapper($message));
         }
+        return 1;
     }
     return;
 }