diff --git a/vpn/wireguard/wireguard.ui b/vpn/wireguard/wireguard.ui
index e0c378ff..4206405d 100644
--- a/vpn/wireguard/wireguard.ui
+++ b/vpn/wireguard/wireguard.ui
@@ -1,184 +1,202 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>WireGuardProp</class>
  <widget class="QWidget" name="WireGuardProp">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>495</width>
     <height>454</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>WireGuard Settings</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Interface</string>
      </property>
      <layout class="QFormLayout" name="form1Layout">
       <item row="0" column="0">
        <widget class="QLabel" name="addressIPv4Label">
         <property name="text">
          <string>Address (IPv4):</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="addressIPv4LineEdit">
         <property name="toolTip">
          <string>IPv4 Internet address with
 CIDR (example: 10.22.13.123/32)
 assigned to the local interface.
 IPv4 or IPv6 address (or both) required</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="addressIPv6Label">
         <property name="text">
          <string>Address (IPv6):</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="addressIPv6LineEdit">
         <property name="toolTip">
          <string>IPv6 Internet address with
 CIDR assigned to the local interface.
 (example: fc00:aaaa:aaaa:aa03::1bc9/128) 
 IPv4 or IPv6 address (or both) required</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="privateKeyLabel">
         <property name="text">
          <string>Private key:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="PasswordField" name="privateKeyLineEdit">
         <property name="toolTip">
          <string>Required.
 A base64 private key generated by wg genkey.</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Peer</string>
      </property>
      <layout class="QFormLayout" name="form2Layout">
       <item row="0" column="0">
        <widget class="QLabel" name="publicKeyLabel">
         <property name="text">
          <string>Public key:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="publicKeyLineEdit">
         <property name="toolTip">
          <string>Required.
 A base64 public key calculated by wg pubkey 
 from a private key, and usually transmitted 
 out of band to the author of the configuration file.</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="allowedIPsLabel">
         <property name="text">
          <string>Allowed IPs:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="allowedIPsLineEdit">
         <property name="toolTip">
          <string>Required.
 A comma-separated list of IP (v4 or v6) addresses 
 with CIDR masks from which incoming traffic for 
 this peer is allowed and to which outgoing traffic 
 for this peer is directed. The catch-all 0.0.0.0/0 
 may be specified for matching all IPv4 addresses, 
 and ::/0 may be specified for matching all IPv6 addresses.</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
-       <widget class="QLabel" name="endpointLabel">
+       <widget class="QLabel" name="endpointAddressLabel">
         <property name="text">
-         <string>Endpoint:</string>
+         <string>Endpoint Address:</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
-       <widget class="QLineEdit" name="endpointLineEdit">
+       <widget class="QLineEdit" name="endpointAddressLineEdit">
         <property name="toolTip">
          <string>Optional.
-An endpoint IP followed by a colon, and then a port number.</string>
+An endpoint IP address or name.</string>
         </property>
        </widget>
       </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="endpointPortLabel">
+        <property name="text">
+         <string>Endpoint Port:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="endpointPortLineEdit">
+        <property name="toolTip">
+         <string>Optional.
+An endpoint port number.</string>
+        </property>
+       </widget>
+      </item>
+
+
      </layout>
     </widget>
    </item>
+
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="btnAdvanced">
        <property name="text">
         <string>Advanced...</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>PasswordField</class>
    <extends>QLineEdit</extends>
    <header location="global">passwordfield.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/vpn/wireguard/wireguardwidget.cpp b/vpn/wireguard/wireguardwidget.cpp
index 073add06..f19f54ed 100644
--- a/vpn/wireguard/wireguardwidget.cpp
+++ b/vpn/wireguard/wireguardwidget.cpp
@@ -1,286 +1,330 @@
 /*
     Copyright 2018 Bruce Anderson <banderson19com@san.rr.com>
 
     This program is free software; you can redistribute it and/or
     modify it under the terms of the GNU General Public License as
     published by the Free Software Foundation; either version 2 of
     the License or (at your option) version 3 or any later version
     accepted by the membership of KDE e.V. (or its successor approved
     by the membership of KDE e.V.), which shall act as a proxy
     defined in Section 14 of version 3 of the license.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "debug.h"
 #include "wireguardwidget.h"
 #include "wireguardadvancedwidget.h"
 #include "simpleipv4addressvalidator.h"
 #include "simpleiplistvalidator.h"
 #include "wireguardkeyvalidator.h"
 
 #include <QDBusMetaType>
 #include <QPointer>
+#include <QUrl>
 #include <KColorScheme>
 
 #include "nm-wireguard-service.h"
 
 class WireGuardSettingWidget::Private
 {
 public:
     Private();
 
     Ui_WireGuardProp ui;
     NetworkManager::VpnSetting::Ptr setting;
     KSharedConfigPtr config;
     QPalette warningPalette;
     QPalette normalPalette;
     WireGuardKeyValidator *keyValidator;
     bool addressValid;
     bool privateKeyValid;
     bool publicKeyValid;
     bool allowedIpsValid;
     bool endpointValid;
 };
 
 WireGuardSettingWidget::Private::Private(void)
     : addressValid(false)
     , privateKeyValid(false)
     , publicKeyValid(false)
     , allowedIpsValid(false)
     , endpointValid(true)    // optional so blank is valid
 {
 }
 
 WireGuardSettingWidget::WireGuardSettingWidget(const NetworkManager::VpnSetting::Ptr &setting, QWidget *parent)
     : SettingWidget(setting, parent)
     , d(new Private)
 {
     qDBusRegisterMetaType<NMStringMap>();
 
     d->ui.setupUi(this);
     d->setting = setting;
 
     d->config = KSharedConfig::openConfig();
     d->warningPalette = KColorScheme::createApplicationPalette(d->config);
     d->normalPalette = KColorScheme::createApplicationPalette(d->config);
     KColorScheme::adjustBackground(d->warningPalette, KColorScheme::NegativeBackground, QPalette::Base,
                                    KColorScheme::ColorSet::View, d->config);
 
     KColorScheme::adjustBackground(d->normalPalette, KColorScheme::NormalBackground, QPalette::Base,
                                    KColorScheme::ColorSet::View, d->config);
 
 
     connect(d->ui.addressIPv4LineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkAddressValid);
     connect(d->ui.addressIPv6LineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkAddressValid);
     connect(d->ui.privateKeyLineEdit, &PasswordField::textChanged, this, &WireGuardSettingWidget::checkPrivateKeyValid);
     connect(d->ui.publicKeyLineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkPublicKeyValid);
     connect(d->ui.allowedIPsLineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkAllowedIpsValid);
-    connect(d->ui.endpointLineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkEndpointValid);
+    connect(d->ui.endpointAddressLineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkEndpointValid);
+    connect(d->ui.endpointPortLineEdit, &QLineEdit::textChanged, this, &WireGuardSettingWidget::checkEndpointValid);
 
     d->ui.privateKeyLineEdit->setPasswordModeEnabled(true);
 
     connect(d->ui.btnAdvanced, &QPushButton::clicked, this, &WireGuardSettingWidget::showAdvanced);
 
     SimpleIpV4AddressValidator *ip4WithCidrValidator = 
         new SimpleIpV4AddressValidator(this, SimpleIpV4AddressValidator::AddressStyle::WithCidr);
     d->ui.addressIPv4LineEdit->setValidator(ip4WithCidrValidator);
 
     // Create a validator for the IPv6 address line edit
     // Address must be a valid IP address with a CIDR suffix
     SimpleIpV6AddressValidator *ip6WithCidrValidator =
         new SimpleIpV6AddressValidator(this, SimpleIpV6AddressValidator::AddressStyle::WithCidr);
 
     d->ui.addressIPv6LineEdit->setValidator(ip6WithCidrValidator);
 
     // This is done as a private variable rather than a local variable so it can be
     // used both here and to validate the private key later
     d->keyValidator = new WireGuardKeyValidator(this);
     d->ui.publicKeyLineEdit->setValidator(d->keyValidator);
 
-    // Create validator for Endpoint
-    SimpleIpV4AddressValidator *endpointValidator =
-        new SimpleIpV4AddressValidator(this, SimpleIpV4AddressValidator::AddressStyle::WithPort);
-    d->ui.endpointLineEdit->setValidator(endpointValidator);
-
     // Create validator for AllowedIPs
     SimpleIpListValidator *allowedIPsValidator = new SimpleIpListValidator(this, SimpleIpListValidator::WithCidr,
                                                                            SimpleIpListValidator::Both);
     d->ui.allowedIPsLineEdit->setValidator(allowedIPsValidator);
 
+    // Create validator for endpoint port
+    QIntValidator *portValidator = new QIntValidator(this);
+    portValidator->setBottom(0);
+    portValidator->setTop(65535);
+    d->ui.endpointPortLineEdit->setValidator(portValidator);
+
     // Connect for setting check
     watchChangedSetting();
 
     KAcceleratorManager::manage(this);
 
     if (setting && !setting->isNull()) {
         loadConfig(d->setting);
     }
 
     // Set the initial backgrounds on all the widgets
     checkAddressValid();
     checkPrivateKeyValid();
     checkPublicKeyValid();
     checkAllowedIpsValid();
     checkEndpointValid();
 
 }
 
 WireGuardSettingWidget::~WireGuardSettingWidget()
 {
     delete d;
 }
 
 void WireGuardSettingWidget::loadConfig(const NetworkManager::Setting::Ptr &setting)
 {
     Q_UNUSED(setting)
 
     // General settings
     const NMStringMap dataMap = d->setting->data();
 
     d->ui.addressIPv4LineEdit->setText(dataMap[NM_WG_KEY_ADDR_IP4]);
     d->ui.addressIPv6LineEdit->setText(dataMap[NM_WG_KEY_ADDR_IP6]);
     d->ui.privateKeyLineEdit->setText(dataMap[NM_WG_KEY_PRIVATE_KEY]);
     d->ui.publicKeyLineEdit->setText(dataMap[NM_WG_KEY_PUBLIC_KEY]);
     d->ui.allowedIPsLineEdit->setText(dataMap[NM_WG_KEY_ALLOWED_IPS]);
-    d->ui.endpointLineEdit->setText(dataMap[NM_WG_KEY_ENDPOINT]);
+
+    // An endpoint is stored as <ipv4 | [ipv6] | fqdn>:<port>
+    QString storedEndpoint = dataMap[NM_WG_KEY_ENDPOINT];
+    QStringList endpointList = storedEndpoint.contains("]:") ?
+                               dataMap[NM_WG_KEY_ENDPOINT].split("]:") :
+                               dataMap[NM_WG_KEY_ENDPOINT].split(":");
+
+    d->ui.endpointAddressLineEdit->setText(endpointList[0].remove("["));
+    d->ui.endpointPortLineEdit->setText(endpointList[1]);
 }
 
 void WireGuardSettingWidget::loadSecrets(const NetworkManager::Setting::Ptr &setting)
 {
     // Currently WireGuard does not have any secrets
     Q_UNUSED(setting)
 }
 
 QVariantMap WireGuardSettingWidget::setting() const
 {
     NMStringMap data = d->setting->data();
     NetworkManager::VpnSetting setting;
     setting.setServiceType(QLatin1String(NM_DBUS_SERVICE_WIREGUARD));
 
     // required settings
     setProperty(data, QLatin1String(NM_WG_KEY_ADDR_IP4), d->ui.addressIPv4LineEdit->displayText());
     setProperty(data, QLatin1String(NM_WG_KEY_ADDR_IP6), d->ui.addressIPv6LineEdit->displayText());
     setProperty(data, QLatin1String(NM_WG_KEY_PRIVATE_KEY), d->ui.privateKeyLineEdit->text());
     setProperty(data, QLatin1String(NM_WG_KEY_PUBLIC_KEY), d->ui.publicKeyLineEdit->displayText());
     setProperty(data, QLatin1String(NM_WG_KEY_ALLOWED_IPS), d->ui.allowedIPsLineEdit->displayText());
-    setProperty(data, QLatin1String(NM_WG_KEY_ENDPOINT), d->ui.endpointLineEdit->displayText());
+
+    // Endpoint isn't required and is created from <address>:<port>
+    QString addressString = d->ui.endpointAddressLineEdit->displayText();
+    if (!addressString.isEmpty()) {
+        // If there is a ':' in the address string then it is an IPv6 address and
+        // the output needs to be formatted as '[1:2:3:4:5:6:7:8]:123' otherwhise
+        // it is formatted as '1.2.3.4:123' or 'ab.com:123'
+        if (addressString.contains(":"))
+            setProperty(data, QLatin1String(NM_WG_KEY_ENDPOINT),
+                        "[" +
+                        d->ui.endpointAddressLineEdit->displayText().trimmed() +
+                        "]:" +
+                        d->ui.endpointPortLineEdit->displayText().trimmed());
+        else
+            setProperty(data, QLatin1String(NM_WG_KEY_ENDPOINT),
+                        d->ui.endpointAddressLineEdit->displayText().trimmed() +
+                        ":" +
+                        d->ui.endpointPortLineEdit->displayText().trimmed());
+    }
 
     setting.setData(data);
 
     return setting.toMap();
 }
 
 void WireGuardSettingWidget::setProperty(NMStringMap &data, const QLatin1String &key, const QString &value) const
 {
     if (!value.isEmpty())
         data.insert(key, value);
     else
         data.remove(key);
 }
 
 void WireGuardSettingWidget::showAdvanced()
 {
     QPointer<WireGuardAdvancedWidget> adv = new WireGuardAdvancedWidget(d->setting, this);
 
     connect(adv.data(), &WireGuardAdvancedWidget::accepted,
             [adv, this] () {
                 NetworkManager::VpnSetting::Ptr advData = adv->setting();
                 if (!advData.isNull()) {
                     d->setting->setData(advData->data());
                 }
             });
     connect(adv.data(), &WireGuardAdvancedWidget::finished,
             [adv] () {
                 if (adv) {
                     adv->deleteLater();
                 }
             });
     adv->setModal(true);
     adv->show();
 }
 
 bool WireGuardSettingWidget::isValid() const
 {
     return d->addressValid
            && d->privateKeyValid
            && d->publicKeyValid
            && d->allowedIpsValid
            && d->endpointValid;
 }
 
 void WireGuardSettingWidget::checkAddressValid()
 {
     int pos = 0;
     QLineEdit *widget = d->ui.addressIPv4LineEdit;
     QString value(widget->displayText());
     bool ip4valid = (widget->validator()->validate(value, pos) == QValidator::Acceptable);
     bool ip4present = !widget->displayText().isEmpty();
 
     widget = d->ui.addressIPv6LineEdit;
     value = widget->displayText();
     bool ip6valid = QValidator::Acceptable == widget->validator()->validate(value, pos);
     bool ip6present = !widget->displayText().isEmpty();
 
     d->addressValid = (ip4valid && ip6valid) || (ip4valid && !ip6present) || (!ip4present && ip6valid);
 
     setBackground(d->ui.addressIPv4LineEdit, d->addressValid);
     setBackground(d->ui.addressIPv6LineEdit, d->addressValid);
 
     slotWidgetChanged();
 }
 
 void WireGuardSettingWidget::checkPrivateKeyValid()
 {
     int pos = 0;
     PasswordField *widget = d->ui.privateKeyLineEdit;
     QString value = widget->text();
     d->privateKeyValid = QValidator::Acceptable == d->keyValidator->validate(value, pos);
     setBackground(widget, d->privateKeyValid);
     slotWidgetChanged();
 }
 
 void WireGuardSettingWidget::checkPublicKeyValid()
 {
     int pos = 0;
     QLineEdit *widget = d->ui.publicKeyLineEdit;
     QString value = widget->displayText();
     d->publicKeyValid = QValidator::Acceptable == widget->validator()->validate(value, pos);
     setBackground(widget, d->publicKeyValid);
     slotWidgetChanged();
 }
 
 void WireGuardSettingWidget::checkAllowedIpsValid()
 {
     int pos = 0;
     QLineEdit *widget = d->ui.allowedIPsLineEdit;
     QString value = widget->displayText();
     d->allowedIpsValid = QValidator::Acceptable == widget->validator()->validate(value, pos);
     setBackground(widget, d->allowedIpsValid);
     slotWidgetChanged();
 }
 
 void WireGuardSettingWidget::checkEndpointValid()
 {
     int pos = 0;
-    QLineEdit *widget = d->ui.endpointLineEdit;
-    QString value = widget->displayText();
-    d->endpointValid = QValidator::Acceptable == widget->validator()->validate(value, pos)
-                       || value.isEmpty();
-    setBackground(widget, d->endpointValid);
+    QLineEdit *addressWidget = d->ui.endpointAddressLineEdit;
+    QLineEdit *portWidget = d->ui.endpointPortLineEdit;
+    QString addressValue = addressWidget->displayText();
+    QString portString = portWidget->displayText();
+
+    QUrl temp;
+    static QRegExpValidator fqdnValidator(QRegExp(QLatin1String("(?=.{5,254}$)([a-zA-Z0-9][a-zA-Z0-9-]{1,62}\\.){1,63}[a-zA-Z]{2,63}")), 0);
+    static SimpleIpV4AddressValidator ipv4Validator(0);
+    static SimpleIpV6AddressValidator ipv6Validator(0);
+
+    bool addressValid = QValidator::Acceptable == fqdnValidator.validate(addressValue, pos)
+                        || QValidator::Acceptable == ipv4Validator.validate(addressValue, pos)
+                        || QValidator::Acceptable == ipv6Validator.validate(addressValue, pos);
+    bool bothEmpty = addressValue.isEmpty() && portString.isEmpty();
+    // Because of the validator, if the port is non-empty, it is valid
+    bool portValid = !portString.isEmpty();
+    d->endpointValid = bothEmpty || (addressValid && portValid);
+    setBackground(addressWidget, bothEmpty || addressValid);
+    setBackground(portWidget, bothEmpty || portValid);
+
     slotWidgetChanged();
 }
 
 void WireGuardSettingWidget::setBackground(QWidget *w, bool result) const
 {
     if (result)
         w->setPalette(d->normalPalette);
     else
         w->setPalette(d->warningPalette);
 }