diff --git a/src/main/java/simplexity/simplenicks/commands/arguments/OfflinePlayerArgument.java b/src/main/java/simplexity/simplenicks/commands/arguments/OfflinePlayerArgument.java
index c28e9ef..9b77ded 100644
--- a/src/main/java/simplexity/simplenicks/commands/arguments/OfflinePlayerArgument.java
+++ b/src/main/java/simplexity/simplenicks/commands/arguments/OfflinePlayerArgument.java
@@ -41,13 +41,8 @@ public class OfflinePlayerArgument implements CustomArgumentType<OfflinePlayer,
     @Override
     public @NotNull OfflinePlayer parse(@NotNull StringReader reader) throws CommandSyntaxException {
         String playerName = reader.readString();
-        for (Player player : Bukkit.getOnlinePlayers()) {
-            if (player.getName().equalsIgnoreCase(playerName)) return player;
-        }
-        for (OfflinePlayer player : Bukkit.getOfflinePlayers()) {
-            if (player.getName() == null || player.getName().isEmpty()) continue;
-            if (player.getName().equalsIgnoreCase(playerName)) return player;
-        }
+        OfflinePlayer player = Bukkit.getOfflinePlayerIfCached(playerName);
+        if (player != null) return player;
         throw Exceptions.INVALID_PLAYER_SPECIFIED.create(playerName);
     }
 
diff --git a/src/main/java/simplexity/simplenicks/config/LocaleMessage.java b/src/main/java/simplexity/simplenicks/config/LocaleMessage.java
index e469d8b..c4615bc 100644
--- a/src/main/java/simplexity/simplenicks/config/LocaleMessage.java
+++ b/src/main/java/simplexity/simplenicks/config/LocaleMessage.java
@@ -20,7 +20,7 @@ public enum LocaleMessage {
     SERVER_DISPLAY_NAME("plugin.server-display-name", "<gray>[Server]</gray>"),
 
     // Basic Functionality
-    SET_SELF("nick.set.self", "<green>Changed your nickname to <value><green>!"),
+    SET_SELF("nick.set.self", "<green>Changed your nickname to <reset><value><green>!"),
     SET_TARGET("nick.set.target", "<green>Changed <target>'s nickname to <value>"),
     SET_BY_INITIATOR("nick.set.by-initiator", "<green><initiator> changed your nickname to <reset><value><green>!"),
     RESET_SELF("nick.reset.self", "<green>Reset your nickname!"),