diff --git a/web/app/assets/javascripts/accounts_session_properties.js b/web/app/assets/javascripts/accounts_session_properties.js
index 3d763d188..d86698bcb 100644
--- a/web/app/assets/javascripts/accounts_session_properties.js
+++ b/web/app/assets/javascripts/accounts_session_properties.js
@@ -70,7 +70,7 @@
 
     function toggleStartTime() {
       var valueSelected = $startTimeList.find('option:selected').val();
-      var startIndex = defaultTimeArray.indexOf(valueSelected) + 2;
+      var startIndex = defaultTimeArray.indexOf(valueSelected) + 1;
 
       $endTimeList.empty();
 //      if (startIndex == defaultTimeArray.length ) {
@@ -94,6 +94,8 @@
         $endTimeList.append($('<option value="' + strTime + '" class="label">' + strTime +'</option>'));
       });
 
+      $endTimeList.val(defaultTimeArray[(startIndex + 1) % defaultTimeArray.length]);
+
       context.JK.dropdown($endTimeList);
     }
 
diff --git a/web/app/assets/javascripts/scheduled_session.js b/web/app/assets/javascripts/scheduled_session.js
index 803998c7b..63c9713b4 100644
--- a/web/app/assets/javascripts/scheduled_session.js
+++ b/web/app/assets/javascripts/scheduled_session.js
@@ -979,7 +979,7 @@
 
     function toggleStartTime(dontRebuildDropdowns) {
       var valueSelected = $startTimeList.find('option:selected').val();
-      var startIndex = defaultTimeArray.indexOf(valueSelected) + 2;
+      var startIndex = defaultTimeArray.indexOf(valueSelected) + 1;
 
       var $endTimeList = $('#end-time-list');
       $endTimeList.empty();
@@ -1004,8 +1004,8 @@
         $endTimeList.append($('<option value="' + strTime + '" class="label">' + strTime +'</option>'));
       });
 
-      if (createSessionSettings.endTime != defaultTimeArray[startIndex]) {
-        createSessionSettings.endTime = defaultTimeArray[startIndex];
+      if (createSessionSettings.endTime != defaultTimeArray[startIndex + 1]) {
+        createSessionSettings.endTime = defaultTimeArray[(startIndex + 1) % defaultTimeArray.length];
       }
 
       $endTimeList.val(createSessionSettings.endTime);
diff --git a/web/spec/features/account_spec.rb b/web/spec/features/account_spec.rb
index d260497dc..64fa2baf5 100644
--- a/web/spec/features/account_spec.rb
+++ b/web/spec/features/account_spec.rb
@@ -176,7 +176,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
 
       find('#account-session-properties-div #session-prop-start-date').value.should eq date_string
       find('#account-session-properties-div .selected', text: '11:30 PM')
-      find('#account-session-properties-div .selected', text: '12:00 AM')
+      find('#account-session-properties-div .selected', text: '12:30 AM')
       find('#account-session-properties-div .selected', text: '(GMT+00:00) UTC')
       find('#account-session-properties-div #session-prop-genre .selected', text: 'African')
       find('#account-session-properties-div #session-prop-name').value.should eq "Updated Name"
@@ -194,7 +194,7 @@ describe "Account", :js => true, :type => :feature, :capybara_feature => true do
       # check fields with original values
       find('#account-session-properties-div #session-prop-start-date').value.should eq date_string
       find('#account-session-properties-div .selected', text: '11:30 PM')
-      find('#account-session-properties-div .selected', text: '12:00 AM')
+      find('#account-session-properties-div .selected', text: '12:30 AM')
       find('#account-session-properties-div .selected', text: '(GMT+00:00) UTC')
       find('#account-session-properties-div #session-prop-genre .selected', text: 'African')
       find('#account-session-properties-div #session-prop-name').value.should eq "Updated Name"