Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
diff -u -r0bd81af7dfab0f0879964fccf8a6c2e2494238aa -r1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8
--- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 0bd81af7dfab0f0879964fccf8a6c2e2494238aa)
+++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(.../LessonTabView.as)	(revision 1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8)
@@ -847,19 +847,29 @@
 		var minutes = mydate.getMinutes();
 		var selectedHours = Number(scheduleTime.tHour.text);
 		var selectedMinutes = Number(scheduleTime.tMinute.text);
-		if (scheduleTime.tMeridian.selectedIndex == 0){
+		if (scheduleTime.tMeridian.selectedItem.data == "AM"){
 			checkHours = 0
-		}else{
-			checkHours = 12
 		}
-		if (hours > (selectedHours+checkHours)){
+		
+		if (scheduleTime.tMeridian.selectedItem.data == "PM"){
+			if (Number (selectedHours) == 12){
+				checkHours = 0
+			}else {
+				checkHours = 12
+			}
+		}
+		
+		
+		if (hours > (Number(selectedHours+checkHours))){
 			return false;
-		}else {
+		}else if (hours == Number(selectedHours+checkHours)){
 			if (minutes > selectedMinutes){
 				return false;
 			}else {
 				return true;
 			}
+		}else {
+			return true;
 		}
 	}
 	
Index: lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as
===================================================================
diff -u -r50fa1b0d1af1253176fcbfebc10ced05fde12a74 -r1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8
--- lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as	(.../WizardView.as)	(revision 50fa1b0d1af1253176fcbfebc10ced05fde12a74)
+++ lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as	(.../WizardView.as)	(revision 1fd2b6697e07c10e6f78cc8c83645f72fc2ed1a8)
@@ -1359,19 +1359,26 @@
 		var minutes = mydate.getMinutes();
 		var selectedHours = Number(schedule_time.tHour.text);
 		var selectedMinutes = Number(schedule_time.tMinute.text);
-		if (schedule_time.tMeridian.selectedIndex == 0){
+		if (schedule_time.tMeridian.selectedItem.data == "AM"){
 			checkHours = 0
-		}else{
-			checkHours = 12
 		}
-		if (hours > (selectedHours+checkHours)){
+		if (schedule_time.tMeridian.selectedItem.data == "PM"){
+			if (Number (selectedHours) == 12){
+				checkHours = 0
+			}else {
+				checkHours = 12
+			}
+		}
+		if (hours > (Number(selectedHours+checkHours))){
 			return false;
-		}else {
+		}else if (hours == Number(selectedHours+checkHours)){
 			if (minutes > selectedMinutes){
 				return false;
 			}else {
 				return true;
 			}
+		}else {
+			return true;
 		}
 	}
 	/**