--- loncom/interface/loncommon.pm	2016/08/14 00:24:29	1.1075.2.109
+++ loncom/interface/loncommon.pm	2016/09/01 01:27:25	1.1075.2.111
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.109 2016/08/14 00:24:29 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.111 2016/09/01 01:27:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4691,7 +4691,7 @@ sub check_ip_acc {
         return 1;
     }
     my $allowed=0;
-    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'} || $clientip;
+    my $ip=$ENV{'REMOTE_ADDR'} || $clientip || $env{'request.host'};
 
     my $name;
     foreach my $pattern (split(',',$acc)) {
@@ -14602,6 +14602,9 @@ sub construct_course {
        if ($args->{'setcontent'}) {
            $cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
        }
+       if ($args->{'setcomment'}) {
+           $cenv{'comment.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'};
+       }
     }
     if ($args->{'reshome'}) {
 	$cenv{'reshome'}=$args->{'reshome'}.'/';