diff --git a/ChangeLog b/ChangeLog
index f8e12680..487554a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -18649,3 +18649,6 @@
 	* Modified apis/rivwebcapi/rivwebcapi/rd_editcart.h and
 	apis/rivwebcapi/rivwebcapi/rd_editcut.h to match the
 	respective rd_cart.h, rd_cuts.h files in the api.
+2019-05-09 Patrick Linstruth <patrick@deltecent.com>
+	* Fixed bug in clock schedule rules where "or After" schedule codes
+	were not displayed correctly.
diff --git a/lib/rdschedruleslist.cpp b/lib/rdschedruleslist.cpp
index 495dba7c..1c54f35c 100644
--- a/lib/rdschedruleslist.cpp
+++ b/lib/rdschedruleslist.cpp
@@ -64,7 +64,7 @@ RDSchedRulesList::RDSchedRulesList(QString clockname,RDConfig *config)
       min_wait[i] = q1->value(1).toInt();
       not_after[i] = q1->value(2).toString();
       or_after[i] = q1->value(3).toString();
-      or_after_II[i] = q1->value(3).toString();
+      or_after_II[i] = q1->value(4).toString();
     }
     else {
       max_row[i] = 1;
diff --git a/rdlogmanager/edit_schedcoderules.cpp b/rdlogmanager/edit_schedcoderules.cpp
index b639c26c..bf590206 100644
--- a/rdlogmanager/edit_schedcoderules.cpp
+++ b/rdlogmanager/edit_schedcoderules.cpp
@@ -146,7 +146,7 @@ editSchedCodeRules::editSchedCodeRules(Q3ListViewItem *item,
     }
   comboBox_not_after->setCurrentText(item->text(3));
   comboBox_or_after->setCurrentText(item->text(4));
-  comboBox_or_after->setCurrentText(item->text(5));
+  comboBox_or_after_II->setCurrentText(item->text(5));
 
   label_description = new QLabel(this);
   label_description->setGeometry( QRect( 200, 40, 300, 40 ) );