diff --git a/course/edit_form.php b/course/edit_form.php
index 4ac54d12107..5a4cb0aca40 100644
--- a/course/edit_form.php
+++ b/course/edit_form.php
@@ -76,14 +76,6 @@ class course_edit_form extends moodleform {
             $mform->setConstant('category', $category->id);
         }
 
-        $fullname  = get_string('defaultcoursefullname');
-        $shortname = get_string('defaultcourseshortname');
-        while ($DB->record_exists('course', array('fullname'=>$fullname))
-            or $DB->record_exists('course', array('fullname'=>$fullname))) {
-            $fullname++;
-            $shortname++;
-        }
-
         $mform->addElement('text','fullname', get_string('fullnamecourse'),'maxlength="254" size="50"');
         $mform->addHelpButton('fullname', 'fullnamecourse');
         $mform->addRule('fullname', get_string('missingfullname'), 'required', null, 'client');
@@ -93,8 +85,6 @@ class course_edit_form extends moodleform {
             $mform->setConstant('fullname', $course->fullname);
         }
 
-        $mform->setDefault('fullname', $fullname);
-
         $mform->addElement('text','shortname', get_string('shortnamecourse'),'maxlength="100" size="20"');
         $mform->addHelpButton('shortname', 'shortnamecourse');
         $mform->addRule('shortname', get_string('missingshortname'), 'required', null, 'client');
@@ -104,8 +94,6 @@ class course_edit_form extends moodleform {
             $mform->setConstant('shortname', $course->shortname);
         }
 
-        $mform->setDefault('shortname', $shortname);
-
         $mform->addElement('text','idnumber', get_string('idnumbercourse'),'maxlength="100"  size="10"');
         $mform->addHelpButton('idnumber', 'idnumbercourse');
         $mform->setType('idnumber', PARAM_RAW);
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 6302225288d..9fe71e40ba4 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -416,8 +416,6 @@ $string['day'] = 'day';
 $string['days'] = 'days';
 $string['decodinginternallinks'] = 'Decoding internal links';
 $string['default'] = 'Default';
-$string['defaultcoursefullname'] = 'Course Fullname 101';
-$string['defaultcourseshortname'] = 'CF101';
 $string['defaultcoursestudent'] = 'Student';
 $string['defaultcoursestudentdescription'] = 'Students generally have fewer privileges within a course.';
 $string['defaultcoursestudents'] = 'Students';