diff --git a/LSL2/STPROC/OBJ_WM_IN.txt b/LSL2/STPROC/OBJ_WM_IN.txt
index 900314f..1f6fc24 100644
--- a/LSL2/STPROC/OBJ_WM_IN.txt
+++ b/LSL2/STPROC/OBJ_WM_IN.txt
@@ -20,7 +20,7 @@ DECLARE FUNCTION Get_Status, Msg, Utility, obj_Tables, NextKey, obj_WO_Verify, o
 DECLARE FUNCTION Database_Services, obj_RDS2, Logging_Services, Environment_Services, Error_Services
 DECLARE SUBROUTINE Set_Status, Msg, obj_Tables, Send_Dyn, obj_WO_Step, obj_RDS_Layer, obj_RDS_Test, Update_Index
 DECLARE SUBROUTINE obj_Post_Log, obj_WO_Mat_Log,obj_WO_Wfr, Set_Property, Database_Services, Extract_SI_Keys
-DECLARE SUBROUTINE Logging_Services
+DECLARE SUBROUTINE Logging_Services, obj_Notes
 
 $INSERT MSG_EQUATES
 $INSERT WO_LOG_EQU
@@ -140,18 +140,24 @@ Create:
 		LogData<2> = WMInKey
 		LogData<3> = WMInRec
 		LogData<4> = 'Record does not exist after obj_WM_IN("Create") call.'
-		Machine = Environment_Services('GetServer')
-		If Machine NE 'MESSA01EC' then
-			EmailAddr = 'dstieber@srpcs.com,6613649828@txt.att.net'
-			EmailMsg  = 'WM_IN record ':WMInKey:' does not exist after obj_WM_IN("Create") call.'
-			Logging_Services('AppendLog', ObjLog, LogData, @RM, @FM, False$, EmailAddr, EmailMsg)
-		end else
-			Logging_Services('AppendLog', ObjLog, LogData, @RM, @FM, False$)       
-		end
+		Logging_Services('AppendLog', ObjLog, LogData, @RM, @FM, False$)
+		
+		// Notify OI_SYSADMIN group
+		Recipients   = ''
+		SentFrom     = 'SYSTEM'
+		Subject      = 'Error Creating WM_IN Record'
+		Message      = LoggingDTM
+		Message<2>   = WMInKey
+		Message<3>   = WMInRec
+		Message<4>   = 'Record does not exist after obj_WM_IN("Create") call.'
+		Swap @FM with \0D0A\ in Message
+		AttachWindow = ''
+		AttachKey    = ''
+		SendToGroup  = 'OI_SYSADMIN'
+		Parms        = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
+		obj_Notes('Create',Parms)		
 	end
 	
-	* obj_Tables('WriteRec','WM_IN':@RM:WMInKey:@RM:@RM:WMInRec)
-	
 RETURN
 
 
@@ -936,3 +942,4 @@ RETURN
 
 
 
+
diff --git a/LSL2/STPROC/OBJ_WM_OUT.txt b/LSL2/STPROC/OBJ_WM_OUT.txt
index 66cbe9a..e78aa87 100644
--- a/LSL2/STPROC/OBJ_WM_OUT.txt
+++ b/LSL2/STPROC/OBJ_WM_OUT.txt
@@ -23,7 +23,7 @@ Declare Function   Database_Services
 Declare Subroutine Set_Status, Msg, obj_Tables, Send_Dyn, obj_WO_Step, obj_RDS_Layer, obj_RDS_Test, Btree.Extract
 Declare Subroutine Extract_SI_Keys, obj_WM_Out, obj_WO_Mat, obj_Post_Log, obj_WO_Mat_Log, ErrMsg, obj_WO_Wfr
 Declare Subroutine Logging_Services, Material_Services, Database_Services, Update_Index, Work_Order_Services
-Declare Subroutine Service_Services
+Declare Subroutine Service_Services, obj_Notes
 
 $Insert MSG_EQUATES
 $Insert APP_INSERTS
@@ -258,14 +258,23 @@ Create:
 			LogData<2> = WMOutKey
 			LogData<3> = WMOutRec
 			LogData<4> = 'Record does not exist after obj_WM_OUT("Create") call.'
-			Machine    = Environment_Services('GetServer')
-			If Machine NE 'MESSA01EC' then
-				EmailAddr = 'dstieber@srpcs.com,6613649828@txt.att.net'
-				EmailMsg  = 'WM_OUT record ':WMOutKey:' does not exist after obj_WM_OUT("Create") call.'
-				Logging_Services('AppendLog', objReleaseLog, LogData, @RM, @FM, False$, EmailAddr, EmailMsg)
-			end else
-				Logging_Services('AppendLog', objReleaseLog, LogData, @RM, @FM, False$)       
-			end
+			Logging_Services('AppendLog', objReleaseLog, LogData, @RM, @FM, False$)
+			
+			// Notify OI_SYSADMIN group
+			Recipients   = ''
+			SentFrom     = 'SYSTEM'
+			Subject      = 'Error Creating WM_OUT Record'
+			Message      = LoggingDTM
+			Message<2>   = WMOutKey
+			Message<3>   = WMOutRec
+			Message<4>   = 'Record does not exist after obj_WM_OUT("Create") call.'
+			Swap @FM with \0D0A\ in Message
+			AttachWindow = ''
+			AttachKey    = ''
+			SendToGroup  = 'OI_SYSADMIN'
+			Parms        = Recipients:@RM:SentFrom:@RM:Subject:@RM:Message:@RM:AttachWindow:@RM:AttachKey:@RM:SendToGroup
+			obj_Notes('Create',Parms)	
+			
 		end
 		
 		WMOCassNo += 1
@@ -1953,3 +1962,4 @@ ConvertCleanInsp:
 RETURN
 
 
+