diff --git a/runelite-client/src/main/java/net/runelite/client/RuneLite.java b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
index e76e44564d..c7ad2f25f2 100644
--- a/runelite-client/src/main/java/net/runelite/client/RuneLite.java
+++ b/runelite-client/src/main/java/net/runelite/client/RuneLite.java
@@ -24,7 +24,6 @@
  */
 package net.runelite.client;
 
-import com.google.common.base.Strings;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
@@ -184,9 +183,7 @@ public class RuneLite
 				log.warn("unable to set look and feel", ex);
 			}
 
-			gui = new ClientUI(client);
-			setTitle(null);
-
+			gui = new ClientUI(properties, client);
 			setupTrayIcon();
 		});
 
@@ -220,18 +217,6 @@ public class RuneLite
 		pluginManager.watch();
 	}
 
-	public void setTitle(String extra)
-	{
-		if (!Strings.isNullOrEmpty(extra))
-		{
-			gui.setTitle(properties.getTitle() + " " + properties.getVersion() + " " + extra);
-		}
-		else
-		{
-			gui.setTitle(properties.getTitle() + " " + properties.getVersion());
-		}
-	}
-
 	private void setupTrayIcon()
 	{
 		if (!SystemTray.isSupported())
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
index fdaa339d8e..9c98c53315 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
@@ -35,7 +35,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import javax.imageio.ImageIO;
 import javax.inject.Inject;
 import lombok.extern.slf4j.Slf4j;
-import net.runelite.client.RuneLite;
 import net.runelite.client.account.AccountSession;
 import net.runelite.client.account.SessionManager;
 import net.runelite.client.events.SessionClose;
@@ -56,9 +55,6 @@ import net.runelite.http.api.ws.messages.LoginResponse;
 @Slf4j
 public class AccountPlugin extends Plugin
 {
-	@Inject
-	RuneLite runelite;
-
 	@Inject
 	SessionManager sessionManager;
 
@@ -188,7 +184,7 @@ public class AccountPlugin extends Plugin
 
 		log.debug("Session opened as {}", session.getUsername());
 
-		runelite.setTitle("(" + session.getUsername() + ")");
+		ui.setTitle("(" + session.getUsername() + ")");
 
 		replaceLoginWithLogout();
 	}
@@ -204,7 +200,7 @@ public class AccountPlugin extends Plugin
 	@Subscribe
 	public void onSessionClose(SessionClose sessionClose)
 	{
-		runelite.setTitle(null);
+		ui.setTitle(null);
 	}
 
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
index ef26e13b0a..5637197d83 100644
--- a/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
+++ b/runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
@@ -25,6 +25,7 @@
 package net.runelite.client.ui;
 
 import java.applet.Applet;
+import com.google.common.base.Strings;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.WindowAdapter;
@@ -42,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.runelite.api.Client;
 import net.runelite.api.GameState;
 import net.runelite.client.RuneLite;
+import net.runelite.client.RuneliteProperties;
 import org.pushingpixels.substance.internal.ui.SubstanceRootPaneUI;
 
 @Slf4j
@@ -52,21 +54,23 @@ public class ClientUI extends JFrame
 	private static final int EXPANDED_WIDTH = CLIENT_WIDTH + PluginPanel.PANEL_WIDTH + SCROLLBAR_WIDTH;
 
 	private final Applet client;
+	private final RuneliteProperties properties;
 	private JPanel container;
 	private JPanel navContainer;
 	private ClientPanel panel;
 	private PluginToolbar pluginToolbar;
 	private PluginPanel pluginPanel;
 
-	public ClientUI(Applet client)
+	public ClientUI(RuneliteProperties properties, Applet client)
 	{
+		this.properties = properties;
 		this.client = client;
 		setUIFont(new FontUIResource(FontManager.getRunescapeFont()));
 		init();
 		pack();
 		TitleBarPane titleBarPane = new TitleBarPane(this.getRootPane(), (SubstanceRootPaneUI)this.getRootPane().getUI());
 		titleBarPane.editTitleBar(this);
-		setTitle("RuneLite");
+		setTitle(null);
 		setIconImage(RuneLite.ICON);
 		setLocationRelativeTo(getOwner());
 		setResizable(true);
@@ -89,6 +93,20 @@ public class ClientUI extends JFrame
 		}
 	}
 
+
+	@Override
+	public void setTitle(String extra)
+	{
+		if (!Strings.isNullOrEmpty(extra))
+		{
+			super.setTitle(properties.getTitle() + " " + properties.getVersion() + " " + extra);
+		}
+		else
+		{
+			super.setTitle(properties.getTitle() + " " + properties.getVersion());
+		}
+	}
+
 	private void init()
 	{
 		assert SwingUtilities.isEventDispatchThread();