diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 097a3c1a4..b062351c1 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -509,7 +509,7 @@ module CoursesHelper
     type = []
     month = Time.now.month
     now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
-    year = month < 3 ? now_year - 1 : now_year
+    year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
     for i in (year..year + 10)
       option = []
       option << i
diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 6f2819f53..ef0c2eb16 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -254,6 +254,8 @@ class CoursesService
     #course.safe_attributes = params[:course]
     course.time = params[:time]
     course.term = params[:term]
+    course.end_time = params[:end_time]
+    course.end_term = params[:end_term]
     course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index f62951236..984fb4212 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -46,14 +46,15 @@
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"}  %>
-            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"}  %>
+            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time"}  %>
+            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term"}  %>
           </li>
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time_selected"}  %>
-            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term_selected"}  %>
+            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time"}  %>
+            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term"}  %>
+            <span class="c_red" id="course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
           <li class="ml45 mb10">
@@ -138,8 +139,6 @@
         $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("anonymos");
     }
-    $("#time_selected").click(select);
-    $("#term_selected").click(select);
-    $("#end_time_selected").click(select);
-    $("#end_term_selected").click(select);
+    $("#time").click(select);
+    $("#term").click(select);
 </script>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 6c2f0af71..fff30dec5 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -193,7 +193,7 @@ function submit_new_course()
 
 function submit_edit_course(id)
 {
-    if(regex_course_name()&&regex_course_class_period()&&regex_course_password())
+    if(regex_course_name()&&regex_course_class_period()&&regex_time_term()&&regex_course_password())
     {
         $("#edit_course_"+id).submit();
     }