diff --git a/html/src/app.js b/html/src/app.js
index 40d98fc1..043f76e9 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -4813,27 +4813,17 @@ speechSynthesis.getVoices();
                 break;
 
             case 'user-location':
-                if (content.world === Object(content.world)) {
-                    this.$emit('WORLD', {
-                        json: content.world,
-                        params: {
-                            worldId: content.world.id
-                        }
-                    });
-                }
-                this.$emit('USER', {
-                    json: {
-                        id: content.userId,
-                        location: content.location
-                    },
-                    params: {
-                        userId: content.userId
-                    }
-                });
-
                 // update current user location
+                if (content.userId !== this.currentUser.id) {
+                    console.error('user-location wrong userId', content);
+                    break;
+                }
+
+                // content.user: {}
+                // content.world: {}
+
                 this.currentUser.presence.instance = content.instance;
-                this.currentUser.presence.world = content.world?.id;
+                this.currentUser.presence.world = content.worldId;
                 this.currentUser.$locationTag = content.location;
                 $app.updateCurrentUserLocation();
                 break;
@@ -23989,7 +23979,7 @@ speechSynthesis.getVoices();
 
     $app.methods.updateDatabaseVersion = async function () {
         var databaseVersion = 6;
-        if (this.databaseVersion !== databaseVersion) {
+        if (this.databaseVersion < databaseVersion) {
             if (this.databaseVersion) {
                 var msgBox = this.$message({
                     message:
diff --git a/html/src/mixins/tabs/playerList.pug b/html/src/mixins/tabs/playerList.pug
index 4b8ab22c..069d595c 100644
--- a/html/src/mixins/tabs/playerList.pug
+++ b/html/src/mixins/tabs/playerList.pug
@@ -116,6 +116,13 @@ mixin playerListTab()
                                         span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp;
                                         span.avatar-info-public(v-if="scope.row.avatar.releaseStatus === 'public'") {{ $t('dialog.avatar.labels.public') }}
                                         span.avatar-info-own(v-else-if="scope.row.avatar.releaseStatus === 'private'") {{ $t('dialog.avatar.labels.private') }}
+                                    span(v-else-if="scope.row.type === 'SpawnEmoji'")
+                                        span(v-if="scope.row.imageUrl")
+                                            el-tooltip(placement="right")
+                                                template(#content)
+                                                    img.friends-list-avatar(v-lazy="scope.row.imageUrl" style="height:500px;cursor:pointer" @click="downloadAndSaveImage(scope.row.imageUrl)")
+                                                span(v-text="scope.row.text")
+                                        span(v-else v-text="scope.row.text")
                                     span(v-else-if="scope.row.color === 'yellow'" v-text="scope.row.text" style="color:yellow")
                                     span(v-else v-text="scope.row.text")
                     el-tab-pane(:label="$t('view.player_list.photon.previous')")
@@ -180,6 +187,13 @@ mixin playerListTab()
                                         span(v-if="!scope.row.inCache" style="color:#aaa") #[i.el-icon-download]&nbsp;
                                         span.avatar-info-public(v-if="scope.row.avatar.releaseStatus === 'public'") {{ $t('dialog.avatar.labels.public') }}
                                         span.avatar-info-own(v-else-if="scope.row.avatar.releaseStatus === 'private'") {{ $t('dialog.avatar.labels.private') }}
+                                    span(v-else-if="scope.row.type === 'SpawnEmoji'")
+                                        span(v-if="scope.row.imageUrl")
+                                            el-tooltip(placement="right")
+                                                template(#content)
+                                                    img.friends-list-avatar(v-lazy="scope.row.imageUrl" style="height:500px;cursor:pointer" @click="downloadAndSaveImage(scope.row.imageUrl)")
+                                                span(v-text="scope.row.text")
+                                        span(v-else v-text="scope.row.text")
                                     span(v-else-if="scope.row.color === 'yellow'" v-text="scope.row.text" style="color:yellow")
                                     span(v-else v-text="scope.row.text")
             div.current-instance-table