diff --git a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
index b8e2e81..ee27e35 100644
--- a/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
+++ b/LSL2/STPROC/RETURN_TO_FAB_SERVICES.txt
@@ -469,7 +469,7 @@ Service SetBinToBin(RTFId, MHUserId)
                                     //Send notification that a return to fab record was created.
                                     CassId             = RTFRecord<RETURN_TO_FAB_LOTS_CASS_ID$>
                                     RTFOrigUser        = RTFRecord<RETURN_TO_FAB_LOTS_REQUESTOR_USER_ID$>
-                                    Message            = 'Return to fab form updated for ' : CassId : ' by ' : RTFOrigUser : '.' : CRLF$
+                                    Message            = 'Return to fab form updated for ' : CassId : ' by ' : MHUserId : '.' : CRLF$
                                     Message           := 'Initial Bin to Bin has been marked as completed.' : CRLF$
                                     Message           := 'Link to Return To Fab form: https://goto.infineon.com/oiwizard/ReturnToFab'
                                     Recipients         = XLATE('NOTIFICATION','SHIPPING',NOTIFICATION_USER_ID$,'X')
@@ -543,7 +543,7 @@ Service SetRTFCompleted(RTFId, CompleteUserId)
                             //Send notification that a return to fab record was created.
                             CassId             = RTFRecord<RETURN_TO_FAB_LOTS_CASS_ID$>
                             RTFOrigUser        = RTFRecord<RETURN_TO_FAB_LOTS_REQUESTOR_USER_ID$>
-                            Message            = 'Return to fab form updated for ' : CassId : ' by ' : RTFOrigUser : '.' : CRLF$
+                            Message            = 'Return to fab form updated for ' : CassId : ' by ' : CompleteUserId : '.' : CRLF$
                             Message           := 'Return to fab marked as completed.' : CRLF$
                             Message           := 'Link to Return To Fab form: https://goto.infineon.com/oiwizard/ReturnToFab'
                             Recipients         = XLATE('NOTIFICATION','SHIPPING',NOTIFICATION_USER_ID$,'X')
@@ -617,7 +617,7 @@ Service SetEvalInfo(RTFId, EvalUserId, ResultId)
                                         //Send notification that a return to fab record was created.
                                         CassId             = RTFRecord<RETURN_TO_FAB_LOTS_CASS_ID$>
                                         RTFOrigUser        = RTFRecord<RETURN_TO_FAB_LOTS_REQUESTOR_USER_ID$>
-                                        Message            = 'Return to fab form updated for ' : CassId : ' by ' : RTFOrigUser : '.' : CRLF$
+                                        Message            = 'Return to fab form updated for ' : CassId : ' by ' : EvalUserId : '.' : CRLF$
                                         Message           := 'Result has been set to ' : ResultDescription : '.' : CRLF$
                                         Message           := 'Link to Return To Fab form: https://goto.infineon.com/oiwizard/ReturnToFab'
                                         Recipients         = XLATE('NOTIFICATION','SHIPPING',NOTIFICATION_USER_ID$,'X')
@@ -821,3 +821,4 @@ end service
 
 
 
+