diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
index f8ed31a8..93cd6c38 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
@@ -3770,7 +3770,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
                 // Reset login delay as on successfully login the meter resets the retry-lock-in-delay
                 _loginDelay_ms = DefaultLoginDelay_ms;
                 LogText(Resources.StrLoginPwdLevel8);
-                InfoProcessSuccess(lblPasswordFileCheck, Resources.StrPasswordFileValid);
+                //InfoProcessSuccess(lblPasswordFileCheck, Resources.StrPasswordFileValid);
                 _passwordFileIsCorrupted = false;
                 return StatusReturn.Okay;
             }
@@ -4075,19 +4075,12 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// <remarks date="2020-Dec-09" author="Thomas Wiedebusch">
         /// - Initial
         /// </remarks>
+        /// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
+        /// - Activity message moved to ExecReadRegister()
+        /// </remarks>
         private void InitReadRegister()
         {
             SetControlsAllButtonsDisabled();
-            if (_invokerProcessState == ProcessState.CompareRegisters)
-            {
-                InfoProcessActive(lblRegisterReadout, Resources.StrRegisterCompareActive);
-            }
-            else
-            {
-                InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
-            }
-            //set the process bars
-            SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
             _registerRestorer.OnProcessUpdate += ProcessUpdate_Event;
         }
 
@@ -4104,38 +4097,50 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// <remarks date="2023-Nov-21" author="Thomas Wiedebusch">
         /// - Skip final read and compare if not updated or no recovery request.
         /// </remarks>
+        /// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
+        /// - Status unknown implemented,
+        /// - activity message moved from InitReadRegister()
+        /// </remarks>
         private StatusReturn ExecReadRegister()
         {
             Boolean retVal;
             switch (_invokerProcessState)
             {
                 case ProcessState.InitialReadRegisters:
+                    SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
+                    InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
                     retVal = _registerRestorer.InitialReadRegisters();
                     break;
 
                 case ProcessState.FinalReadRegisters:
                     if (_afterUpdateConnect || _recoveryRegistersRequired)
                     {
+                        SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
+                        InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
                         retVal = _registerRestorer.FinalReadRegisters();
                     }
                     else
                     {
-                        retVal = true;
+                        return StatusReturn.Unknown;
                     }
                     break;
 
                 case ProcessState.CompareRegisters:
-                    if (_afterUpdateConnect || _recoveryRegistersRequired)
+                    if ( _recoveryRegistersRequired)
                     {
+                        SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
+                        InfoProcessActive(lblRegisterReadout, Resources.StrRegisterCompareActive);
                         retVal = _registerRestorer.CompareRegisters();
                     }
                     else
                     {
-                        retVal = true;
+                        return StatusReturn.Unknown;
                     }
                     break;
 
                 default:
+                    SetOverallProgressDisplayOn(Resources.StrRegisterReadoutActive);
+                    InfoProcessActive(lblRegisterReadout, Resources.StrRegisterReadoutActive);
                     retVal = _registerRestorer.ReadRegisters();
                     break;
             }
@@ -4166,6 +4171,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// <remarks date="2023-Nov-21" author="Thomas Wiedebusch">
         /// - Context depending message.
         /// </remarks>
+        /// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
+        /// - Status unknown implemented.
+        /// </remarks>
         private void FinalReadRegisters(StatusReturn success, IReadOnlyList<Object> exitProcessStateObjects)
         {
             if (_registerRestorer != null)
@@ -4207,23 +4215,28 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
                 return;
             }
 
-            switch (_invokerProcessState)
+            if (success == StatusReturn.Failed)
             {
-                case ProcessState.InitialReadRegisters:
-                    msg = Resources.StrRegisterReadoutFailed;
-                    break;
-                case ProcessState.FinalReadRegisters:
-                    msg = Resources.StrRegisterReadoutFailed;
-                    break;
-                case ProcessState.CompareRegisters:
-                    msg = Resources.StrRegisterCompareFailed;
-                    break;
-                default:
-                    msg = Resources.StrRegisterReadoutFailed;
-                    break;
+                switch (_invokerProcessState)
+                {
+                    case ProcessState.InitialReadRegisters:
+                        msg = Resources.StrRegisterReadoutFailed;
+                        break;
+                    case ProcessState.FinalReadRegisters:
+                        msg = Resources.StrRegisterReadoutFailed;
+                        break;
+                    case ProcessState.CompareRegisters:
+                        msg = Resources.StrRegisterCompareFailed;
+                        break;
+                    default:
+                        msg = Resources.StrRegisterReadoutFailed;
+                        break;
+                }
+                InfoProcessFailed(lblRegisterReadout, msg);
+                _processState = errorExitState;
             }
-            InfoProcessFailed(lblRegisterReadout, msg);
-            _processState = errorExitState;
+            // Go ahead as it is nothing to do
+            _processState = successExitState;
             // change first the process state, otherwise the timer may switch the bar on again
             SetOverallProgressDisplayOff();
         }
@@ -4769,12 +4782,12 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// <remarks date="2020-Dec-18" author="Thomas Wiedebusch">
         /// - Initial
         /// </remarks>
+        /// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
+        /// - Moved process messages to ExecRegisterRecovery().
+        /// </remarks>
         private void InitRegisterRecovery()
         {
             SetControlsAllButtonsDisabled();
-            InfoProcessActive(lblRegisterRestore, Resources.StrRegisterAccessActive);
-            //set the process bars
-            SetOverallProgressDisplayOn(Resources.StrRegisterAccessActive);
             _registerRestorer.OnProcessUpdate += ProcessUpdate_Event;
         }
 
@@ -4796,6 +4809,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
         /// <remarks date="2023-Oct-26" author="Thomas Wiedebusch">
         /// - Removed redundant marker for recovery required.
         /// </remarks>
+        /// <remarks date="2024-Jun-25" author="Thomas Wiedebusch">
+        /// - Moved process messages from InitRegisterRecovery().
+        /// </remarks>
         private StatusReturn ExecRegisterRecovery()
         {
             var retVal = StatusReturn.Okay;
@@ -4808,6 +4824,9 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
                     if (device.RecoveryRegisters == null || device.RecoveryRegisters.Count == 0)
                         return StatusReturn.Okay;
 
+                    InfoProcessActive(lblRegisterRestore, Resources.StrRegisterAccessActive);
+                    //set the process bars
+                    SetOverallProgressDisplayOn(Resources.StrRegisterAccessActive);
                     retVal = _registerRestorer.WriteRegisters(device.RecoveryRegisters);
                     break;
                 }