diff --git a/html/src/app.js b/html/src/app.js
index 194a3c6d..a3f6f8e5 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -3665,14 +3665,12 @@ speechSynthesis.getVoices();
                     this.$emit('PIPELINE', {
                         json
                     });
-                    if (
-                        $app.debugWebSocket &&
-                        json.content &&
-                        this.cachedUsers.has(json.content.userId)
-                    ) {
+                    if ($app.debugWebSocket && json.content) {
                         var displayName = '';
                         var user = this.cachedUsers.get(json.content.userId);
-                        displayName = user.displayName;
+                        if (user) {
+                            displayName = user.displayName;
+                        }
                         console.log(
                             'WebSocket',
                             json.type,
@@ -7349,7 +7347,7 @@ speechSynthesis.getVoices();
                 params.featured = 'false';
                 break;
             default:
-                params.sort = 'popularity';
+                params.sort = 'relevance';
                 params.search = this.searchText;
                 break;
         }
@@ -8926,7 +8924,7 @@ speechSynthesis.getVoices();
         this.currentUserTreeData = buildTreeData(API.currentUser);
     };
 
-    $app.methods.promptUserDialog = function () {
+    $app.methods.promptUserIdDialog = function () {
         this.$prompt('Enter a User URL or ID (UUID)', 'Direct Access', {
             distinguishCancelAndClose: true,
             confirmButtonText: 'OK',
@@ -8954,6 +8952,21 @@ speechSynthesis.getVoices();
         });
     };
 
+    $app.methods.promptUsernameDialog = function () {
+        this.$prompt('Enter a Username', 'Direct Access', {
+            distinguishCancelAndClose: true,
+            confirmButtonText: 'OK',
+            cancelButtonText: 'Cancel',
+            inputPattern: /\S+/,
+            inputErrorMessage: 'Username is required',
+            callback: (action, instance) => {
+                if (action === 'confirm' && instance.inputValue) {
+                    this.lookupUser({displayName: instance.inputValue});
+                }
+            }
+        });
+    };
+
     $app.methods.promptWorldDialog = function () {
         this.$prompt('Enter a World URL or ID (UUID)', 'Direct Access', {
             distinguishCancelAndClose: true,
@@ -8985,7 +8998,7 @@ speechSynthesis.getVoices();
     };
 
     $app.methods.promptAvatarDialog = function () {
-        this.$prompt('Enter a Avatar ID (UUID)', 'Direct Access', {
+        this.$prompt('Enter a Avatar URL or ID (UUID)', 'Direct Access', {
             distinguishCancelAndClose: true,
             confirmButtonText: 'OK',
             cancelButtonText: 'Cancel',
diff --git a/html/src/index.pug b/html/src/index.pug
index 0286b08c..5cf1e1f7 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -246,13 +246,13 @@ html
                         el-button-group(style="margin-top:15px")
                             el-button(v-if="searchWorldParams.offset" @click="moreSearchWorld(-1)" icon="el-icon-back" size="small") Prev
                             el-button(v-if="searchWorldResults.length" @click="moreSearchWorld(1)" icon="el-icon-right" size="small") Next
-                    el-tab-pane(label="Avatar" v-loading="isSearchAvatarLoading" style="min-height:60px")
-                        el-dropdown(@command="(command) => searchAvatar(command)" size="small" trigger="click" style="margin-bottom:15px")
-                            el-button(size="small") Search by Category #[i.el-icon-arrow-down.el-icon--right]
-                            el-dropdown-menu(#default="dropdown")
-                                el-dropdown-item(command="updated") Updated Recently
-                                el-dropdown-item(command="created") New
-                                el-dropdown-item(command="mine") Mine
+                    //- el-tab-pane(label="Avatar" v-loading="isSearchAvatarLoading" style="min-height:60px")
+                    //-     el-dropdown(@command="(command) => searchAvatar(command)" size="small" trigger="click" style="margin-bottom:15px")
+                    //-         el-button(size="small") Search by Category #[i.el-icon-arrow-down.el-icon--right]
+                    //-         el-dropdown-menu(#default="dropdown")
+                    //-             el-dropdown-item(command="updated") Updated Recently
+                    //-             el-dropdown-item(command="created") New
+                    //-             el-dropdown-item(command="mine") Mine
                         span(style="margin-left:10px;font-size:12px;color:#909399") Avatar search is not possible.
                         .x-friend-list
                             .x-friend-item(v-for="avatar in searchAvatarResults" :key="avatar.id" @click="showAvatarDialog(avatar.id)")
@@ -511,7 +511,9 @@ html
                     span.header Direct Access
                     div(style="margin-top:10px")
                         el-button-group
-                            el-button(size="small" @click="promptUserDialog()") User
+                            
+                            el-button(size="small" @click="promptUsernameDialog()") Username
+                            el-button(size="small" @click="promptUserIdDialog()") User ID
                             el-button(size="small" @click="promptWorldDialog()") World/Instance
                             el-button(size="small" @click="promptAvatarDialog()") Avatar
                 div.options-container