diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js
index c8218b365..8606a47ff 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamTeacherTime/Form.js	
@@ -23,11 +23,14 @@ var bootstrap = function ($, learun) {
                 text: 'text',
                 select: function (item) {
                     if (!!item) {
-                        $('#EmpNo').lrselectRefresh({
-                            url: top.$.rootUrl + '/EducationalAdministration/Exam_InvigilateTeacher/GetList?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + $('#Semester').lrselectGet(),
-                            value: 'EmpNo',
-                            text: 'EmpName'
-                        });
+                        var Semester = $('#Semester').lrselectGet();
+                        if (!!Semester) {
+                            $('#EmpNo').lrselectRefresh({
+                                url: top.$.rootUrl + '/EducationalAdministration/Exam_InvigilateTeacher/GetList?AcademicYearNo=' + $('#AcademicYearNo').lrselectGet() + '&Semester=' + Semester,
+                                value: 'EmpNo',
+                                text: 'EmpName'
+                            });
+                        }
                     }
                 }
             });
@@ -51,6 +54,8 @@ var bootstrap = function ($, learun) {
             $('#EmpNo').lrselect({
                 type: 'multiple',
                 allowSearch: true,
+                value: 'EmpNo',
+                text: 'EmpName'
             });
         },
         initData: function () {
@@ -63,9 +68,6 @@ var bootstrap = function ($, learun) {
                         else {
                             $('[data-table="' + id + '"]').lrSetFormData(data[id]);
                         }
-                        //if (!!data[id] && !!data[id].EmpNo) {
-                        //    $('#EmpNo').lrselectSet(data[id].EmpNo);
-                        //}
                     }
                 });
             }