--- loncom/interface/loncommon.pm	2018/11/18 22:50:52	1.1324
+++ loncom/interface/loncommon.pm	2019/01/26 00:18:48	1.1325
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1324 2018/11/18 22:50:52 raeburn Exp $
+# $Id: loncommon.pm,v 1.1325 2019/01/26 00:18:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -13937,7 +13937,7 @@ sub load_tmp_file {
 
 sub valid_datatoken {
     my ($datatoken) = @_;
-    if ($datatoken =~ /^$match_username\_$match_domain\_enroll_$match_domain\_$match_courseid\_\d+_\d+$/) {
+    if ($datatoken =~ /^$match_username\_$match_domain\_enroll_(|$match_domain\_$match_courseid)\_\d+_\d+$/) {
         return $datatoken;
     }
     return;