--- loncom/auth/lonroles.pm	2012/08/16 17:02:46	1.274
+++ loncom/auth/lonroles.pm	2012/08/19 03:11:43	1.275
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.274 2012/08/16 17:02:46 raeburn Exp $
+# $Id: lonroles.pm,v 1.275 2012/08/19 03:11:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -291,8 +291,10 @@ sub handler {
                 if (my ($ccrole,$domain,$coursenum) =
 		    ($envkey =~ m-^form\.(cc|co)\./($match_domain)/($match_courseid)$-)) {
                     if ($dcroles{$domain}) {
-                        &Apache::lonnet::check_adhoc_privs($domain,$coursenum,
-                                                           $update,$refresh,$now,$ccrole);
+                        if (&Apache::lonnet::check_adhoc_privs($domain,$coursenum,
+                                                           $update,$refresh,$now,$ccrole)) {
+                            &Apache::lonnet::appenv({"environment.internal.$domain.$coursenum.$ccrole.adhoc" => time});
+                        }
                     }
                     last;
                 }
@@ -515,6 +517,12 @@ ENDENTERKEY
                         my $msg;
 			my ($furl,$ferr)=
 			    &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+                        unless (($ferr) || ($env{'form.switchrole'}) ||
+                                ($env{"environment.internal.$cdom.$cnum.$role.adhoc"})) {
+                            &Apache::lonnet::put('nohist_crslastlogin',
+                                {$env{'user.name'}.':'.$env{'user.domain'}.
+                                ':'.$csec.':'.$role => $now},$cdom,$cnum);
+                        }
 			if (($env{'form.orgurl'}) && 
 			    ($env{'form.orgurl'}!~/^\/adm\/flip/)) {
 			    my $dest=$env{'form.orgurl'};