diff --git a/net/wireguard/Makefile b/net/wireguard/Makefile
index e30ee70a2..f8cc39b53 100644
--- a/net/wireguard/Makefile
+++ b/net/wireguard/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		wireguard
-PLUGIN_VERSION=		0.2
+PLUGIN_VERSION=		0.3
 PLUGIN_COMMENT=		WireGuard VPN service
 PLUGIN_DEPENDS=		wireguard
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net/wireguard/src/etc/rc.d/opnsense-wireguard b/net/wireguard/src/etc/rc.d/opnsense-wireguard
index d820901a2..257ae2758 100755
--- a/net/wireguard/src/etc/rc.d/opnsense-wireguard
+++ b/net/wireguard/src/etc/rc.d/opnsense-wireguard
@@ -38,7 +38,7 @@ wireguard_start()
     echo "starting wireguard"
     for STARTER in ${wireguard_config}; do
         $command up $STARTER
-	ifconfig $STARTER group wireguard
+	ifconfig $STARTER group wg
     done
 }
 
diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php
index a51f8e935..af0924e28 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php
@@ -55,7 +55,7 @@ class ServerController extends ApiMutableModelControllerBase
                 $node = $this->getModel()->servers->server->Add();
             }
             $node->setNodes($this->request->getPost("server"));
-            if (empty((string)$node->pubkey) || empty((string)$node->privkey)) {
+            if (empty((string)$node->pubkey) && empty((string)$node->privkey)) {
                 // generate new keypair
                 $backend = new Backend();
                 $keyspriv = $backend->configdpRun("wireguard genkey", 'private');
@@ -80,7 +80,7 @@ class ServerController extends ApiMutableModelControllerBase
                 $node = $this->getModel()->servers->server->Add();
             }
             $node->setNodes($this->request->getPost("server"));
-            if (empty((string)$node->pubkey) || empty((string)$node->privkey)) {
+            if (empty((string)$node->pubkey) && empty((string)$node->privkey)) {
                 // generate new keypair
                 $backend = new Backend();
                 $keyspriv = $backend->configdpRun("wireguard genkey", 'private');
diff --git a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
index c08a6c500..2b50d5543 100644
--- a/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
+++ b/net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
@@ -20,13 +20,13 @@
     <field>
         <id>server.pubkey</id>
         <label>Public Key</label>
-        <type>info</type>
+        <type>text</type>
         <help>Public key of this instance. After saving you will see here your public key.</help>
     </field>
     <field>
         <id>server.privkey</id>
         <label>Private Key</label>
-        <type>info</type>
+        <type>text</type>
         <help>Private key of this instance. After saving you will see here your public key, please keep it safe.</help>
     </field>
     <field>
diff --git a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
index 1a822f1c9..41c6ba7c6 100644
--- a/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
+++ b/net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/wireguard/client</mount>
     <description>Wireguard Client configuration</description>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <items>
         <clients>
             <client type="ArrayField">
@@ -24,7 +24,7 @@
                     <Required>Y</Required>
                     <asList>Y</asList>
                 </tunneladdress>
-                <serveraddress type="NetworkField">
+                <serveraddress type="HostnameField">
                     <Required>N</Required>
                 </serveraddress>
                 <serverport type="PortField">