--- loncom/auth/lonroles.pm	2023/11/17 17:02:21	1.372
+++ loncom/auth/lonroles.pm	2024/09/04 20:49:39	1.373
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.372 2023/11/17 17:02:21 raeburn Exp $
+# $Id: lonroles.pm,v 1.373 2024/09/04 20:49:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -703,7 +703,7 @@ sub handler {
 						     $env{'user.name'},
                                                      &mt('Assigned from [_1] at [_2] for [_3]'
                                                         ,$ip
-                                                        ,&Apache::lonlocal::locallocaltime()
+                                                        ,&Apache::lonlocal::locallocaltime($now)
                                                         ,$trolecode)
                                                      );
 				 unless ($assignresult eq 'ok') {
@@ -2245,7 +2245,7 @@ sub build_roletext {
                         $trolecode."','".$buttonname.'\');" /></td>';
         }
     }
-    if (($trolecode !~ m/^(dc|ca|au|aa)\./)  && (!$skipcal)) {
+    if (($trolecode !~ m/^(ca|aa)\./) && ($trest ne '') && (!$skipcal)) {
 	$tremark.=&Apache::lonannounce::showday(time,1,
 			 &Apache::lonannounce::readcalendar($tdom.'_'.$trest));
     }