diff --git a/includes/openvpn.php b/includes/openvpn.php
index eae9c42d..a89c3e18 100755
--- a/includes/openvpn.php
+++ b/includes/openvpn.php
@@ -42,11 +42,9 @@ function DisplayOpenVPNConfig()
     }
 
     exec('pidof openvpn | wc -l', $openvpnstatus);
-    exec('wget https://ipinfo.io/ip -qO -', $return);
-
     $serviceStatus = $openvpnstatus[0] == 0 ? "down" : "up";
     $auth = file(RASPI_OPENVPN_CLIENT_LOGIN, FILE_IGNORE_NEW_LINES);
-    $public_ip = $return[0];
+    $public_ip = get_public_ip();
 
     // parse client auth credentials
     if (!empty($auth)) {
diff --git a/includes/wireguard.php b/includes/wireguard.php
index af81a618..162e3eef 100644
--- a/includes/wireguard.php
+++ b/includes/wireguard.php
@@ -58,12 +58,14 @@ function DisplayWireGuardConfig()
     exec('pidof wg-crypt-wg0 | wc -l', $wgstatus);
     $serviceStatus = $wgstatus[0] == 0 ? "down" : "up";
     $wg_state = ($wgstatus[0] > 0);
+    $public_ip = get_public_ip();
 
     echo renderTemplate(
         "wireguard", compact(
             "status",
             "wg_state",
             "serviceStatus",
+            "public_ip",
             "optRules",
             "wg_log",
             "peer_id",
@@ -132,7 +134,7 @@ function SaveWireGuardUpload($status, $file, $optRules)
             file_put_contents($tmp_wgconfig, $tmp_contents);
         }
 
-        // Move uploaded file from to destination
+        // Move processed file from tmp to destination
         system("sudo mv $tmp_wgconfig ". RASPI_WIREGUARD_CONFIG, $return);
 
         if ($return ==0) {
diff --git a/templates/wg/general.php b/templates/wg/general.php
index 00d840ac..c9b63071 100644
--- a/templates/wg/general.php
+++ b/templates/wg/general.php
@@ -3,6 +3,12 @@
   <div class="row">
     <div class="col-md-6">
       <h4 class="mt-3"><?php echo _("Tunnel settings"); ?></h4>
+        <div class="col-lg-12 mt-2">
+          <div class="row mt-3 mb-2">
+            <div class="info-item col-xs-3"><?php echo _("IPv4 Address"); ?></div>
+            <div class="info-value col-xs-3"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+          </div>
+        </div>
         <div class="input-group">
           <div class="custom-control custom-switch">
             <input class="custom-control-input" id="server_enabled" type="checkbox" name="wg_senabled" value="1" <?php echo $wg_senabled ? ' checked="checked"' : "" ?> aria-describedby="server-description">