diff --git a/package.nw/GridTracker.html b/package.nw/GridTracker.html
index 1fe5cf3..62b6ac5 100644
--- a/package.nw/GridTracker.html
+++ b/package.nw/GridTracker.html
@@ -2983,8 +2983,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <tr>
               <td>
                 <label data-i18n="settings.OAMS.simplepush.enable.label" for="msgSimplepush">Enable / Disable Simplepush Message forwarding</label>
-                <input title="Enable / Disable Simplepush" type="checkbox" id="msgSimplepush"
-                     onclick="setOamsSimplepush(this);" />
+                <input title="Enable / Disable Simplepush" type="checkbox" checked="false" id="msgSimplepush"
+                     onclick="newMessageSetting(this);" />
+                <!--                     onclick="setOamsSimplepush(this);" />-->
               </td>
             </tr>
             <tr>
@@ -3005,8 +3006,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
             <tr>
               <td>
                 <label data-i18n="settings.OAMS.pushover.enable.label" for="msgPushover">Enable / Disable Pushover Message forwarding</label>
-                <input title="Enable / Disable Pushover" type="checkbox" id="msgPushover"
-                       onclick="setOamsPushover(this);" />
+                <input title="Enable / Disable Pushover" type="checkbox" checked="false" id="msgPushover"
+                       onclick="newMessageSetting(this);" />
+                <!--                       onclick="setOamsPushover(this);" />-->
               </td>
             </tr>
             <tr>
diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index 37483c9..19b6b5e 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -13024,6 +13024,8 @@ function loadViewSettings()
 function loadMsgSettings()
 {
   msgEnable.checked = GT.appSettings.gtMsgEnable;
+  msgSimplepush.checked = GT.appSettings.msgSimplepush;
+  msgPushover.checked = GT.appSettings.msgPushover;
   GTspotEnable.checked = GT.appSettings.gtSpotEnable;
 
   oamsBandActivity.checked = GT.appSettings.oamsBandActivity;
@@ -16202,4 +16204,4 @@ function refreshSpotsNoTx()
 }
 
 nodeTimers.setInterval(refreshSpotsNoTx, 300000);
-nodeTimers.setTimeout(refreshSpotsNoTx, 300000);
+nodeTimers.setTimeout(refreshSpotsNoTx, 300000);
\ No newline at end of file
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index 46c6d12..b758381 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -633,8 +633,8 @@ function gtChatMessage(jsmesg)
       {
         sendSimplePushMessage(cid, jsmesg);
       }
-      if (GT.msgSettings.msgPushover && GT.msgSettings.pushoverUsername != null &&
-          GT.msgSettings.pushoverToken != null)
+      if (GT.msgSettings.msgPushover && GT.msgSettings.msgPushoverUsername != null &&
+          GT.msgSettings.msgPushoverToken != null)
       {
         sendPushOverMessage(cid, jsmesg);
       }
@@ -868,4 +868,4 @@ function alertChatMessage()
     playAlertMediaFile(GT.msgSettings.msgAlertMedia);
   }
   GT.lastChatMsgAlert = timeNowSec();
-}
+}
\ No newline at end of file