--- loncom/lonnet/perl/lonnet.pm	2010/02/21 06:21:57	1.1051
+++ loncom/lonnet/perl/lonnet.pm	2010/02/25 03:43:27	1.1052
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1051 2010/02/21 06:21:57 raeburn Exp $
+# $Id: lonnet.pm,v 1.1052 2010/02/25 03:43:27 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6685,9 +6685,17 @@ sub createcourse {
     }
     return $uname if ($uname =~ /^error/);
 # -------------------------------------------------- Check supplied server name
-    $course_server = $env{'user.homeserver'} if (! defined($course_server));
-    if (! &is_library($course_server)) {
-        return 'error:bad server name '.$course_server;
+    if (!defined($course_server)) {
+        if (defined(&domain($udom,'primary'))) {
+            $course_server = &domain($udom,'primary');
+        } else {
+            $course_server = $env{'user.home'}; 
+        }
+    }
+    my %host_servers =
+        &Apache::lonnet::get_servers($udom,'library');
+    unless ($host_servers{$course_server}) {
+        return 'error: invalid home server for course: '.$course_server;
     }
 # ------------------------------------------------------------- Make the course
     my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::',