diff --git a/pkg/vpn/openvpn.go b/pkg/vpn/openvpn.go
index ba9437c565f6dc70c39015cc6684e42f7822e399..7e4f8150754f3c9faa6730262812a28cf33330d4 100644
--- a/pkg/vpn/openvpn.go
+++ b/pkg/vpn/openvpn.go
@@ -345,7 +345,13 @@ func (b *Bitmask) getCert() error {
 					Str("apiUrl", config.APIURL).
 					Msg("Could not parse domain out of API URL")
 			}
-			logDnsLookup(url.Host)
+
+			domain := url.Host
+			// url.Host also contains a port if supplied
+			if strings.Contains(url.Host, ":") {
+				domain = domain[0:strings.Index(domain, ":")]
+			}
+			logDnsLookup(domain)
 			return err
 		}
 		err = os.WriteFile(b.certPemPath, cert, 0600)
diff --git a/pkg/vpn/status.go b/pkg/vpn/status.go
index 24d670b7225920e5b8694aaaf42f8eaaec3885a1..930ac6b25b034bd491dd9ad5b1d63fd2e4529c3c 100644
--- a/pkg/vpn/status.go
+++ b/pkg/vpn/status.go
@@ -147,7 +147,7 @@ func (b *Bitmask) GetBestLocation(transport string) string {
 	location, err := b.api.GetBestLocation(transport)
 	if err != nil {
 		log.Warn().
-			Err(err).
+			Str("err", err.Error()).
 			Str("transport", transport).
 			Msg("Could not get best location")
 	}
diff --git a/pkg/vpn/utils.go b/pkg/vpn/utils.go
index 67e4be9aaa335a13965eb3b03ad436f238603b9e..6b606d821816c164f5dc56eb1b7633698df718d9 100644
--- a/pkg/vpn/utils.go
+++ b/pkg/vpn/utils.go
@@ -115,7 +115,7 @@ func logDnsLookup(domain string) {
 
 	log.Debug().
 		Str("domain", domain).
-		Msg("Resolving domain ...")
+		Msg("Resolving domain")
 	for _, addr := range addrs {
 		log.Debug().
 			Str("domain", domain).