--- loncom/interface/loncommon.pm	2015/07/14 03:03:51	1.1075.2.96
+++ loncom/interface/loncommon.pm	2016/01/27 01:18:13	1.1075.2.97
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.96 2015/07/14 03:03:51 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.97 2016/01/27 01:18:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4632,9 +4632,9 @@ sub blocking_status {
 # build a link to a popup window containing the details
     my $querystring  = "?activity=$activity";
 # $uname and $udom decide whose portfolio the user is trying to look at
-    if ($activity eq 'port') {
-        $querystring .= "&udom=$udom"      if $udom;
-        $querystring .= "&uname=$uname"    if $uname;
+    if (($activity eq 'port') || ($activity eq 'passwd')) {
+        $querystring .= "&udom=$udom"      if ($udom =~ /^$match_domain$/);
+        $querystring .= "&uname=$uname"    if ($uname =~ /^$match_username$/);
     } elsif ($activity eq 'docs') {
         $querystring .= '&url='.&HTML::Entities::encode($url,'&"');
     }
@@ -4659,6 +4659,8 @@ END_MYBLOCK
         $class = '';
     } elsif ($activity eq 'printout') {
         $text = &mt('Printing Blocked');
+    } elsif ($activity eq 'passwd') {
+        $text = &mt('Password Changing Blocked');
     }
     $output .= <<"END_BLOCK";
 <div class='$class'>