--- loncom/interface/lonpickcourse.pm	2014/04/25 17:56:43	1.114
+++ loncom/interface/lonpickcourse.pm	2014/05/30 01:50:05	1.115
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.114 2014/04/25 17:56:43 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.115 2014/05/30 01:50:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -105,7 +105,17 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
+        if ($type ne 'Community') {
+            my %coursedescription =
+                &Apache::lonnet::coursedescription($env{'form.pickedcourse'},
+                                                   {'one_time' => '1'});
+            my $cdom = $coursedescription{'domain'};
+            my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+            if (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'})) {
+                $loaditem{'onload'} .= 'setDefaultCredits();';
+            }
+        }
+        $loaditem{'onload'} .= 'setRoles();setSections();';
     }
     if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) && (!$onlyown)) {
         $loaditem{'onload'} .=  'hideSearching(); ';