Index: ssts-web/src/main/webapp/logon.jsp
===================================================================
diff -u -r40643 -r40644
--- ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40643)
+++ ssts-web/src/main/webapp/logon.jsp	(.../logon.jsp)	(revision 40644)
@@ -1258,13 +1258,15 @@
         barcodeTemp += '9';
         setStartTime();
     }else if(event.keyCode == 13){
-        if (enalbeScanBarcodeLogin){
-        	if(isValidBarcodeInput()){
-                $("#j_password_display").val("<%=barcodeLogonPassword %>");
-        	}
-        }
-        checkSubmit();
-        clearTempBarcodeInfo();
+		if(!modifyPWDWindow){
+			if (enalbeScanBarcodeLogin){
+				if(isValidBarcodeInput()){
+					$("#j_password_display").val("<%=barcodeLogonPassword %>");
+				}
+			}
+			checkSubmit();
+			clearTempBarcodeInfo();
+		}
     }
 }
 function getUserName(){