--- loncom/interface/resetpw.pm	2013/08/17 00:34:29	1.36
+++ loncom/interface/resetpw.pm	2016/01/27 00:24:09	1.37
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Allow access to password changing via a token sent to user's e-mail. 
 #
-# $Id: resetpw.pm,v 1.36 2013/08/17 00:34:29 raeburn Exp $
+# $Id: resetpw.pm,v 1.37 2016/01/27 00:24:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -116,9 +116,14 @@ sub handler {
         my $authtype = &Apache::lonnet::queryauthenticate($uname,$udom);
         if ($authtype =~ /^internal/) {
             my $useremail = $env{'form.useremail'};
-            if ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
-                $output = &invalid_state('baduseremail',$domdesc,
-                                         $contact_name,$contact_email);
+            my ($blocked,$blocktext) =
+                &Apache::loncommon::blocking_status('passwd',$uname,$udom);
+            if ($blocked) {
+                $output = '<p class="LC_warning">'.$blocktext.'</p>'
+                          .&display_actions($contact_email,$domdesc);
+            } elsif ($useremail !~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) {
+                    $output = &invalid_state('baduseremail',$domdesc,
+                                             $contact_name,$contact_email);
             } else {
                 my %userinfo = 
 		    &Apache::lonnet::get('environment',\@emailtypes,
@@ -310,7 +315,12 @@ sub reset_passwd {
         ($data{'email'}  =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) && 
         ($data{'temppasswd'} =~/^\w+$/)) {
         my $reqtime = &Apache::lonlocal::locallocaltime($data{'time'});
-        if ($now - $data{'time'} < 7200) {
+        my ($blocked,$blocktext) =
+            &Apache::loncommon::blocking_status('passwd',$data{'username'},$data{'domain'});
+        if ($blocked) {
+            $msg = '<p class="LC_warning">'.$blocktext.'</p>';
+            return $msg;
+        } elsif ($now - $data{'time'} < 7200) {
             if ($env{'form.action'} eq 'verify_and_change_pass') {
                 unless (($env{'form.uname'} eq $data{'username'}) && ($env{'form.udom'} eq $data{'domain'}) && ($env{'form.email'} eq $data{'email'})) {
                     $msg = &generic_failure_msg($contact_name,$contact_email);