--- loncom/interface/lonpreferences.pm	2009/10/09 13:09:01	1.125.2.4
+++ loncom/interface/lonpreferences.pm	2009/09/16 20:49:18	1.125.6.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.125.2.4 2009/10/09 13:09:01 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.125.6.1 2009/09/16 20:49:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1248,8 +1248,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|
@@ -1334,7 +1332,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="" />
 
 |;
     }
@@ -1481,16 +1478,9 @@ ENDERROR
 	$r->print("<h3>".&mt('The password for [_1] was successfully changed',$user)."</h3>");
     } else {
 	# error error: run in circles, scream and shout
-        if ($caller eq 'reset_by_email') {
-            if (!$result) {
-                return 1;
-            } else {
-                return $result;
-            }
-        } else {
-            $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
-                      &mt('Please make sure your old password was entered correctly.'));
-        }
+        $r->print("<h3><span class='LC_error'>".&mt("The password for [_1] was not changed",$user)."</span></h3>".
+                  &mt('Please make sure your old password was entered correctly.'));
+        return 1;
     }
     return;
 }