diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/usernamesyncer/UsernameSyncerPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/usernamesyncer/UsernameSyncerPlugin.java
index 00fb7debb5..b4086c6bb6 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/usernamesyncer/UsernameSyncerPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/usernamesyncer/UsernameSyncerPlugin.java
@@ -49,12 +49,20 @@ public class UsernameSyncerPlugin extends Plugin
 	@Inject
 	private UsernameSyncerConfig config;
 
+	private String usernameCache;
+
 	@Override
 	protected void startUp() throws Exception
 	{
 		applyUsername();
 	}
 
+	@Override
+	protected void shutDown() throws Exception
+	{
+		client.getPreferences().setRememberedUsername(usernameCache);
+	}
+
 	@Provides
 	UsernameSyncerConfig getConfig(ConfigManager configManager)
 	{
@@ -106,6 +114,12 @@ public class UsernameSyncerPlugin extends Plugin
 				return;
 			}
 
+			// Save it only once
+			if (usernameCache == null)
+			{
+				usernameCache = client.getPreferences().getRememberedUsername();
+			}
+
 			client.getPreferences().setRememberedUsername(username);
 		}
 	}