Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rfd79fadd4f42518f80e2cf3c19eec5a516ed75d4 -r2d0bacfbe1b70055247eb40743405a5f9acb15e3
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision fd79fadd4f42518f80e2cf3c19eec5a516ed75d4)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 2d0bacfbe1b70055247eb40743405a5f9acb15e3)
@@ -96,8 +96,8 @@
         confirmVisible  : false
         onVisibleChanged: {
             if ( visible ) {
-                vAdjustmentVersions.doAdjustment()
-                vAdjustmentService .doAdjustment()
+                vAdjustmentVersions     .doAdjustment()
+                vAdjustmentServiceDates .doAdjustment()
             }
         }
 
@@ -118,19 +118,19 @@
             ]
             itemsValueLeftMargin: 300
             itemsValue  : [
-                ""                                      ,
-                Qt.application.version                  ,
-                vAdjustmentVersions.hdVerDevice         ,
-                vAdjustmentVersions.hdVerFPGA           ,
-                vAdjustmentVersions.hdSerial            ,
-                vAdjustmentVersions.dgVerDevice         ,
-                vAdjustmentVersions.dgVerFPGA           ,
-                vAdjustmentVersions.dgSerial            ,
+                ""                                          ,
+                Qt                      .application.version,
+                vAdjustmentVersions     .hdVerDevice        ,
+                vAdjustmentVersions     .hdVerFPGA          ,
+                vAdjustmentVersions     .hdSerial           ,
+                vAdjustmentVersions     .dgVerDevice        ,
+                vAdjustmentVersions     .dgVerFPGA          ,
+                vAdjustmentVersions     .dgSerial           ,
                 "",
-                vAdjustmentService.hdLastServiceDate    ,
-                vAdjustmentService.hdNextServiceDate    ,
-                vAdjustmentService.dgLastServiceDate    ,
-                vAdjustmentService.dgNextServiceDate    ,
+                vAdjustmentServiceDates .hdLastServiceDate  ,
+                vAdjustmentServiceDates .hdNextServiceDate  ,
+                vAdjustmentServiceDates .dgLastServiceDate  ,
+                vAdjustmentServiceDates .dgNextServiceDate  ,
             ]
             itemsText   : [
                 qsTr("Versions"             ), // col1 title
@@ -186,7 +186,7 @@
             else {
                 if ( password === vSettings.settings["Service Password"].keys[0] ) {
                     _settingsHome.notificationText = ""
-                    serviceMode = true
+                    vAdjustmentServiceMode.doAdjustment()
                 }
                 else {
                     _settingsHome.notificationText = qsTr("Incorrect service password")
@@ -249,6 +249,18 @@
         }
     }
 
+    Connections { target: vAdjustmentServiceMode
+        onAdjustmentTriggered   : {
+            if ( vAdjustmentServiceMode.adjustment_Accepted ) {
+                _settingsHome.notificationText = ""
+                serviceMode = true
+            }
+            else {
+                _settingsHome.notificationText = vAdjustmentServiceMode.text()
+            }
+        }
+    }
+
     onVisibleChanged: {
         if (visible) {
             _mainMenu.hidden = false