Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4c992d223269b589edf3e60f01bfaeaf2307488a -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4c992d223269b589edf3e60f01bfaeaf2307488a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      30-Sep-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      20-Oct-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -2027,6 +2027,8 @@
     if ( ( 3 == message->hdr.payloadLen ) && ( 0x31 == message->payload[ 0 ] ) && ( 0x32 == message->payload[ 1 ] ) && ( 0x33 == message->payload[ 2 ] ) )
     {
         testerLoggedIn = TRUE;
+        // The user logged in, so the set the dialin expiration date until the first check in from dialin is received
+        setDialinCheckInTimeStamp();
     }
     else
     {
@@ -3434,7 +3436,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);
@@ -3496,7 +3499,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);
@@ -3585,7 +3589,8 @@
     U32 totalMessages;
     U32 payloadLength;
 
-    if ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) )
+    if ( ( message->hdr.payloadLen >= ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ) ) &&
+         ( DG_MODE_SERV == getCurrentOperationMode() ) )
     {
         memcpy(&currentMessage, payloadPtr, sizeof(U32));
         payloadPtr += sizeof(U32);