diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 29161f5ff8..f3ee6badad 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -206,72 +206,72 @@
                 <span class="detail">Important steps and segments of your course</span>
               </header>
 
-              <div class="row row-col2">
+              <div class="row row-col2 datepair">
                 <h4 class="label">Course Dates:</h4>
                 
-                <div class="field datepair">
+                <div class="field">
                   <div class="input multi multi-inline">
                     <div class="group">
                       <label for="course-start-date">Start Date</label>
-                      <input type="text" class="start-date date" id="course-start-date" placeholder="MM/DD/YYYY" autocomplete="off">
+                      <input type="text" class="start-date date start" id="course-start-date" placeholder="MM/DD/YYYY" autocomplete="off">
                       <span class="tip tip-stacked">First day the course begins</span>          
                     </div>
 
                     <div class="group">
                       <label for="course-start-time">Start Time</label>
-                      <input type="text" class="time" id="course-start-time" value="" placeholder="HH:MM">
+                      <input type="text" class="time start" id="course-start-time" value="" placeholder="HH:MM" autocomplete="off">
                       <span class="tip tip-stacked">(UTC/GMT -5 hours)</span>          
                     </div>
                   </div>
                 </div>
 
-                <div class="field field-additional datepair">
+                <div class="field field-additional">
                   <div class="input multi multi-inline">
                     <div class="group">
                       <label for="course-end-date">End Date</label>
-                      <input type="text" class="end-date date" id="course-end-date" placeholder="MM/DD/YYYY" autocomplete="off">
+                      <input type="text" class="end-date date end" id="course-end-date" placeholder="MM/DD/YYYY" autocomplete="off">
                       <span class="tip tip-stacked">Last day the course is active</span>          
                     </div>
 
                     <div class="group">
                       <label for="course-end-time">End Time</label>
-                      <input type="text" class="time" id="course-end-time" value="" placeholder="HH:MM">
+                      <input type="text" class="time end" id="course-end-time" value="" placeholder="HH:MM" autocomplete="off">
                       <span class="tip tip-stacked">(UTC/GMT -5 hours)</span>          
                     </div>
                   </div>
                 </div>
               </div>
 
-              <div class="row row-col2">
+              <div class="row row-col2 datepair">
                 <h4 class="label">Enrollment Dates:</h4>
                 
-                <div class="field datepair">
+                <div class="field">
                   <div class="input multi multi-inline">
                     <div class="group">
                       <label for="course-enrollment-start-date">Start Date</label>
-                      <input type="text" class="start-date date" id="course-enrollment-start-date" placeholder="MM/DD/YYYY">
+                      <input type="text" class="start-date date start" id="course-enrollment-start-date" placeholder="MM/DD/YYYY" autocomplete="off">
                       <span class="tip tip-stacked">First day students can enroll</span>          
                     </div>
 
                     <div class="group">
                       <label for="course-enrollment-start-time">Start Time</label>
-                      <input type="text" class="time" id="course-enrollment-start-time" value="" placeholder="HH:MM">
+                      <input type="text" class="time start" id="course-enrollment-start-time" value="" placeholder="HH:MM" autocomplete="off">
                       <span class="tip tip-stacked">(UTC/GMT -5 hours)</span>           
                     </div>
                   </div>
                 </div>
 
-                <div class="field field-additional datepair">
+                <div class="field field-additional">
                   <div class="input multi multi-inline">
                     <div class="group">
-                      <label for="course-enrollment-end-date">Start Date</label>
-                      <input type="text" class="start-end date" id="course-enrollment-end-date" placeholder="MM/DD/YYYY">
-                      <span class="tip tip-stacked">First day students can enroll</span>          
+                      <label for="course-enrollment-end-date">End Date</label>
+                      <input type="text" class="end-date date end" id="course-enrollment-end-date" placeholder="MM/DD/YYYY" autocomplete="off">
+                      <span class="tip tip-stacked">Last day students can enroll</span>          
                     </div>
 
                     <div class="group">
                       <label for="course-enrollment-end-time">End Time</label>
-                      <input type="text" class="time" id="course-enrollment-end-time" value="" placeholder="HH:MM">
+                      <input type="text" class="time end" id="course-enrollment-end-time" value="" placeholder="HH:MM" autocomplete="off">
                       <span class="tip tip-stacked">(UTC/GMT -5 hours)</span>           
                     </div>
                   </div>