Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r9feea867113c62088f0ce91750127972dbd9bf53 -r16b79d9ec32acce57b5bb007fc19a5c891c7fff1
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 16b79d9ec32acce57b5bb007fc19a5c891c7fff1)
@@ -243,9 +243,16 @@
     {
         if ( TRUE == isDGCommunicating() )
         {
-            treatStartReqReceived = TRUE;
-            result = TRUE;
-            rejReason = REQUEST_REJECT_REASON_NONE;
+            if ( ( DG_MODE_STAN == getDGOpMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == getDGSubMode() ) )
+            {
+                treatStartReqReceived = TRUE;
+                result = TRUE;
+                rejReason = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                rejReason = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE;
+            }
         }
         else
         {
Index: firmware/App/Modes/SampleWater.c
===================================================================
diff -u -re5d1d67106a93a6cd1b5692b586625d715732e2f -r16b79d9ec32acce57b5bb007fc19a5c891c7fff1
--- firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
+++ firmware/App/Modes/SampleWater.c	(.../SampleWater.c)	(revision 16b79d9ec32acce57b5bb007fc19a5c891c7fff1)
@@ -218,6 +218,11 @@
         state = SAMPLE_WATER_STATE;
     }
 
+    if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+    {
+        activateAlarmNoData( ALARM_ID_DG_RESTARTED_FAULT );
+    }
+
     return state;
 }