diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index a26b1c23b..b10147462 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -144,9 +144,12 @@ class CoursesController < ApplicationController
             @course.course_list_id = new_course_list.id
           end
         else
+          subject = Subject.find_by!(id: params[:subject_id])
           @course.start_date = params[:start_date]
-          @course.subject_id = params[:subject_id]
+          @course.subject_id = subject.id
           @course.excellent = true
+          course_list = CourseList.find_by(name: subject.name) || CourseList.create!(name: subject.name, user_id: current_user.id, is_admin: 0)
+          @course.course_list_id = course_list.id
         end
 
         @course.is_end = @course.end_date.present? && @course.end_date < Date.today
diff --git a/db/migrate/20190902062449_migrate_excellent_course_course_list.rb b/db/migrate/20190902062449_migrate_excellent_course_course_list.rb
new file mode 100644
index 000000000..a93db7695
--- /dev/null
+++ b/db/migrate/20190902062449_migrate_excellent_course_course_list.rb
@@ -0,0 +1,12 @@
+class MigrateExcellentCourseCourseList < ActiveRecord::Migration[5.2]
+  def change
+    courses = Course.where(excellent: true)
+    courses.each do |course|
+      if !course.course_list.present? && course.subject
+        subject = course.subject
+        course_list = CourseList.find_by(name: subject.name) || CourseList.create!(name: subject.name, user_id: course.tea_id, is_admin: 0)
+        course.update_attributes(course_list_id: course_list.id)
+      end
+    end
+  end
+end
diff --git a/dump.rdb b/dump.rdb
index 6d0966fe0..6673bf623 100644
Binary files a/dump.rdb and b/dump.rdb differ