diff --git a/main.go b/main.go
index dd7b0be..9def1cd 100644
--- a/main.go
+++ b/main.go
@@ -22,8 +22,9 @@ var (
 		"Server IP/hostname and port, written as \"server:port\".")
 	argPassword = kingpin.Arg("password", "The RCON password.")
 
-	address  *net.UDPAddr
-	password string
+	address    *net.UDPAddr
+	addressStr string
+	password   string
 
 	socket       *net.UDPConn
 	socketBuffer = make([]byte, 64*1024)
@@ -39,7 +40,7 @@ func initSocketAddr(addr string) (err error) {
 		return
 	}
 
-	address = newAddr
+	address, addressStr = newAddr, addr
 
 	return
 }
diff --git a/main_windows.go b/main_windows.go
index ebc430c..b981811 100644
--- a/main_windows.go
+++ b/main_windows.go
@@ -91,10 +91,6 @@ func runGraphicalUi() (err error) {
 		return
 	}
 	connectAction.Triggered().Attach(func() {
-		addressStr := ""
-		if address != nil {
-			addressStr = address.String()
-		}
 		result, addr, pw, err := runConnectDialog(addressStr, password, dlg)
 		if err != nil {
 			uiLogError(fmt.Sprintf("Failed to run connect dialog: %s", err))