Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -rf6e33ed36c7d103fe9d4dba64e3e5f55d6dbbd3a -r710816dfce521fce66e2b86e9982ba4d47e0753e
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision f6e33ed36c7d103fe9d4dba64e3e5f55d6dbbd3a)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 710816dfce521fce66e2b86e9982ba4d47e0753e)
@@ -125,7 +125,7 @@
 /*0089*/case GuiAlarmID::ALARM_ID_DG_OUTLET_UV_REACTOR_ON_WITH_NO_FLOW                : { result = QObject::tr("DG outlet UV reactor on with no flow."                                                                                                          ); break; } /*  89*/
 /*0090*/case GuiAlarmID::ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT                       : { result = QObject::tr("DG load cells A1/B1 FPGA fault."                                                                                                                ); break; } /*  90*/
 /*0091*/case GuiAlarmID::ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE                  : { result = QObject::tr("HD No dialysate flow data receive in the last 3 seconds."                                                                                       ); break; } /*  91*/
-/*0092*/case GuiAlarmID::ALARM_ID_AVAILABLE_1                                         : { result = QObject::tr("Available for use."                                                                                                                             ); break; } /*  92*/
+/*0092*/case GuiAlarmID::ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD           : { result = QObject::tr("DG temperature sensors invalid calibration record."                                                                                             ); break; } /*  92*/
 /*0093*/case GuiAlarmID::ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE         : { result = QObject::tr("DG outlet primary conductivity out of range."                                                                                                   ); break; } /*  93*/
 /*0094*/case GuiAlarmID::ALARM_ID_DG_PRESSURE_OUT_OF_RANGE                            : { result = QObject::tr("DG pressure out of range."                                                                                                                      ); break; } /*  94*/
 /*0095*/case GuiAlarmID::ALARM_ID_DG_WATCHDOG_EXPIRED                                 : { result = QObject::tr("DG watchdog expired."                                                                                                                           ); break; } /*  95*/
Index: sources/wifi/WifiInterface.cpp
===================================================================
diff -u -r83b9d737cd495b34a7b42f5409962a9442f3b8f4 -r710816dfce521fce66e2b86e9982ba4d47e0753e
--- sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 83b9d737cd495b34a7b42f5409962a9442f3b8f4)
+++ sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 710816dfce521fce66e2b86e9982ba4d47e0753e)
@@ -256,7 +256,23 @@
     LOG_DEBUG(QString("stderr: %1").arg(err));
     _scanRunning = false;
     emit didScanStatusChanged(_scanRunning);
-    parseWifiScan(out);
+    QList<WifiNetworkData> networks = parseWifiScan(out);
+
+    // A non-empty macAddress indicates UI is connected to a network
+    // if the network security type list is empty, this indicates that the connection
+    // was a result of a start-up reconnection. Traverse through discovered networks
+    // and update the security type list and signal strength info
+    if(!_network.macAddress().isEmpty() && _network.securityTypes().isEmpty()) {
+        foreach(WifiNetworkData network, networks){
+            if(network.macAddress() == _network.macAddress()){
+                // update the security and signal info
+                _network.securityTypes(network.securityTypes());
+                _network.signalLevel(network.signalLevel());
+                emit didConnectToNetwork(_network);
+            }
+        }
+    }
+
     LOG_DEBUG("WiFi Scan Finished");
 }