diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java
index 815ace0..7d204b3 100644
--- a/src/com/annimon/turrets/GameCanvas.java
+++ b/src/com/annimon/turrets/GameCanvas.java
@@ -52,6 +52,10 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
         gameStarted = false;
     }
     
+    public void setServerAddress(String inetAddress) {
+        this.inetAddress = inetAddress;
+    }
+    
     @Override
     protected void draw(Graphics2D g) {
         final FontMetrics metrics = g.getFontMetrics(font);
@@ -130,7 +134,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
                 GameServer server = new GameServer(this);
                 socketHelper = server.getHelper();
             } else {
-                GameClient client = new GameClient("localhost", this);
+                GameClient client = new GameClient(inetAddress, this);
                 socketHelper = client.getHelper();
             }
             socketHelper.start();
diff --git a/src/com/annimon/turrets/MenuPanel.java b/src/com/annimon/turrets/MenuPanel.java
index 7bf2856..432ab4c 100644
--- a/src/com/annimon/turrets/MenuPanel.java
+++ b/src/com/annimon/turrets/MenuPanel.java
@@ -1,6 +1,7 @@
 package com.annimon.turrets;
 
 import static com.annimon.turrets.Constants.SCREEN_DIMENSION;
+import com.annimon.turrets.util.Prefs;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
@@ -76,6 +77,7 @@ public class MenuPanel extends JPanel {
                 case 1: // Join client
                     menuList.removeSelectionInterval(0, 1);
                     GameCanvas canvas = new GameCanvas(index == 0);
+                    canvas.setServerAddress(Prefs.getInstance().lastIp());
                     Main.getInstance().switchLayout(canvas);
                     new Thread(canvas).start();
                     break;