diff --git a/locale/en_US/LC_MESSAGES/messages.mo b/locale/en_US/LC_MESSAGES/messages.mo
index 61815f7d..412bad3c 100644
Binary files a/locale/en_US/LC_MESSAGES/messages.mo and b/locale/en_US/LC_MESSAGES/messages.mo differ
diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po
index ab3424e4..f93c5a6c 100644
--- a/locale/en_US/LC_MESSAGES/messages.po
+++ b/locale/en_US/LC_MESSAGES/messages.po
@@ -1332,9 +1332,24 @@ msgstr "Expected %s binary not found at: %s"
 msgid "Visit the <a href=\"%s\" target=\"_blank\">installation instructions</a> for %s's Linux CLI."
 msgstr "Visit the <a href=\"%s\" target=\"_blank\">installation instructions</a> for %s's Linux CLI."
 
+msgid "Unable to execute %s binary found at: %s"
+msgstr "Unable to execute %s binary found at: %s"
+
+msgid "Check that binary is executable and permissions exist in raspap.sudoers"
+msgstr "Check that binary is executable and permissions exist in raspap.sudoers"
+
 msgid "Installed Linux CLI: <code>%s</code>"
 msgstr "Installed Linux CLI: <code>%s</code>"
 
 msgid "Current <code>%s</code> connection status is displayed below."
 msgstr "Current <code>%s</code> connection status is displayed below."
 
+msgid "Information provided by %s"
+msgstr "Information provided by %s"
+
+msgid "Connect %s"
+msgstr "Connect %s"
+
+msgid "Disconnect %s"
+msgstr "Disconnect %s"
+
diff --git a/templates/provider.php b/templates/provider.php
index a0f6648c..810a0c04 100755
--- a/templates/provider.php
+++ b/templates/provider.php
@@ -1,10 +1,10 @@
   <?php ob_start() ?>
     <?php if (!RASPI_MONITOR_ENABLED) : ?>
-        <input type="submit" <?php echo $ctlState; ?> class="btn btn-outline btn-primary <?php echo $ctlState; ?>" name="SaveProviderSettings" value="Save settings" />
+    <input type="submit" <?php echo $ctlState; ?> class="btn btn-outline btn-primary <?php echo $ctlState; ?>" name="SaveProviderSettings" value="<?php echo _("Save settings"); ?>" />
         <?php if ($serviceStatus == 'down') : ?>
-        <input type="submit" <?php echo $ctlState; ?> class="btn btn-success <?php echo $ctlState; ?>" name="StartProviderVPN" value="Connect <?php echo $providerName; ?>" />
+        <input type="submit" <?php echo $ctlState; ?> class="btn btn-success <?php echo $ctlState; ?>" name="StartProviderVPN" value="<?php echo sprintf(_("Connect %s"), $providerName); ?>" />
         <?php else : ?>
-        <input type="submit" <?php echo $ctlState; ?> class="btn btn-warning <?php echo $ctlState; ?>" name="StopProviderVPN" value="Disconnect <?php echo $providerName; ?>" />
+        <input type="submit" <?php echo $ctlState; ?> class="btn btn-warning <?php echo $ctlState; ?>" name="StopProviderVPN" value="<?php echo sprintf(_("Disconnect %s"), $providerName); ?>" />
         <?php endif; ?>
     <?php endif ?>
   <?php $buttons = ob_get_clean(); ob_end_clean() ?>
@@ -44,26 +44,8 @@
             <?php echo $buttons ?>
           </form>
         </div><!-- /.card-body -->
-      <div class="card-footer"><?php echo _("Information provided by " .strtolower($providerName)); ?></div>
+      <div class="card-footer"><?php echo sprintf( _("Information provided by %s"), strtolower($providerName)); ?></div>
     </div><!-- /.card -->
   </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
 
-<!-- modal confirm-logout-->
-<div class="modal fade" id="provider-confirm-logout" tabindex="-1" role="dialog" aria-labelledby="ModalLabel" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-      <div class="modal-title" id="ModalLabel"><i class="fas fa-sync mr-2"></i><?php echo sprintf(_("Logout %s"), $providerName); ?></div>
-      </div>
-      <div class="modal-body">
-        <div class="col-md-12 mb-3 mt-1" id="system-reboot-message"><?php echo sprintf(_("Logout now? This will disconnect %s."), $providerName); ?></div>
-      </div>
-      <div class="modal-footer">
-      <button type="button" data-message="<?php echo _("Close"); ?>" class="btn btn-outline-secondary" data-dismiss="modal"><?php echo _("Cancel"); ?></button>
-      <button type="button" id="js-provider-logout" data-action="logout" class="btn btn-outline-danger btn-delete"><?php echo _("Logout"); ?></button>
-      </div>
-    </div>
-  </div>
-</div>
-
diff --git a/templates/provider/general.php b/templates/provider/general.php
index 41538aff..353d5494 100644
--- a/templates/provider/general.php
+++ b/templates/provider/general.php
@@ -16,20 +16,21 @@
       </div>
     </div>
   </div>
+  <?php if (!empty($accountInfo)) : ?>
   <div class="row">
     <div class="col-md-6 mt-1">
       <div class="card">
 	    <div class="card-body">
-
           <h5><?php echo _("Account details"); ?></h5>
             <?php foreach ($accountInfo as $item) {
                 echo '<small>'. $item .'</small><br>';
             } ?>
-            <input type="button" class="btn btn-warning mt-2" data-toggle="modal" data-target="#provider-confirm-logout" value="<?php echo _("Logout"); ?>" />
+            <a href="<?php echo($accountLink); ?>" target="_blank" class="btn btn-warning btn-sm mt-2"><i class="fas fa-external-link-alt ml-1 mr-1"></i><?php echo _("My account") ?></a>
         </div><!-- /.card-body -->
       </div><!-- /.card -->
     </div>
   </div>
+  <?php endif; ?>
   <div class="row">
     <div class="form-group col-md-6 mt-3">
       <h5><?php echo _("Server location"); ?></h5>
diff --git a/templates/provider/status.php b/templates/provider/status.php
index ad648ebe..90f80f9a 100644
--- a/templates/provider/status.php
+++ b/templates/provider/status.php
@@ -2,8 +2,8 @@
 <div class="tab-pane fade" id="providerstatus">
   <h4 class="mt-3 mb-3"><?php echo sprintf(_("%s status"), $providerName) ;?></h4>
 
-  <p><?php echo _("Installed Linux CLI: <code>".$providerVersion."</code>") ?></p>
-  <p><?php echo _("Current <code>".strtolower($providerName)."</code> connection status is displayed below.") ?></p>
+  <p><?php echo sprintf(_("Installed Linux CLI: <code>%s</code>"), $providerVersion); ?></p>
+  <p><?php echo sprintf(_("Current <code>%s</code> connection status is displayed below."), strtolower($providerName)); ?></p>
 
   <div class="row">
     <div class="form-group col-md-8 mt-2">