--- loncom/interface/lonpreferences.pm	2008/03/12 02:45:07	1.116
+++ loncom/interface/lonpreferences.pm	2008/03/24 04:56:22	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.116 2008/03/12 02:45:07 raeburn Exp $
+# $Id: lonpreferences.pm,v 1.117 2008/03/24 04:56:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1325,6 +1325,13 @@ ENDERROR
     #
     if ($caller eq 'reset_by_email') {
         my %data = &Apache::lonnet::tmpget($mailtoken);
+        if (keys(%data) == 0) {
+            &passwordchanger($r,
+                         '<span class="LC_error">'.
+                         &mt('Could not verify current authentication.').'  '.
+                         &mt('Please try again.').'</span>',$caller,$mailtoken);
+            return 1;
+        }
         if ($currentpass ne $data{'temppasswd'}) {
             &passwordchanger($r,
                          '<span class="LC_error">'.