diff --git a/lib/classes/commands/GridCommands.ts b/lib/classes/commands/GridCommands.ts
index 6b17ac7..350a743 100644
--- a/lib/classes/commands/GridCommands.ts
+++ b/lib/classes/commands/GridCommands.ts
@@ -253,14 +253,10 @@ export class GridCommands extends CommandsBase
 
     avatarName2KeyAndName(name: string): Promise<{avatarKey: UUID, avatarName: string}>
     {
-        const check = name.split('.');
-        if (check.length > 1)
+        name = name.trim().replace('.', ' ');
+        if (name.trim().indexOf(' ') === -1)
         {
-            name = check.join(' ');
-        }
-        else
-        {
-            name += ' resident';
+            name = name.trim() + ' resident';
         }
         name = name.toLowerCase();
 
@@ -323,14 +319,10 @@ export class GridCommands extends CommandsBase
 
     avatarName2Key(name: string): Promise<UUID>
     {
-        const check = name.split('.');
-        if (check.length > 1)
+        name = name.trim().replace('.', ' ');
+        if (name.trim().indexOf(' ') === -1)
         {
-            name = check.join(' ');
-        }
-        else
-        {
-            name += ' resident';
+            name = name.trim() + ' resident';
         }
         name = name.toLowerCase();
 
diff --git a/package.json b/package.json
index 600f79d..bd6df83 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@caspertech/node-metaverse",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "A node.js interface for Second Life.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",