diff --git a/src/components/JitsiMediaView.vue b/src/components/JitsiMediaView.vue
index 40d7d87..d176588 100644
--- a/src/components/JitsiMediaView.vue
+++ b/src/components/JitsiMediaView.vue
@@ -103,6 +103,7 @@ export default {
             let configOverwrite = config.setting('configOverwrite');
             configOverwrite.prejoinPageEnabled = false;
 
+            let user = this.network.currentUser();
             let domain = config.setting('server');
             let options = {
                 roomName: this.encodedRoomName,
@@ -112,6 +113,9 @@ export default {
                 onload: () => {
                     this.api.executeCommand('displayName', this.network.nick);
                     this.api.executeCommand('subject', ' ');
+                    if (user.avatar && (user.avatar.large || user.avatar.small)) {
+                        this.api.executeCommand('avatarUrl', user.avatar.large || user.avatar.small);
+                    }
                     this.api.once('videoConferenceJoined', () => {
                         this.loadingAnimationStop();
                         this.isJoined = true;
diff --git a/src/components/MessageTemplate.vue b/src/components/MessageTemplate.vue
index 2bce2c6..cc007c4 100644
--- a/src/components/MessageTemplate.vue
+++ b/src/components/MessageTemplate.vue
@@ -3,7 +3,7 @@
         <div class="plugin-conference-jointext">
             {{ buffer.isQuery() ? inviteText : joinText }}
         </div>
-        <div v-if="!pluginState.isActive" class="u-button u-button-primary" @click="openJitsi()">
+        <div v-if="!pluginState.isActive && (buffer.isQuery() || buffer.joined)" class="u-button u-button-primary" @click="openJitsi()">
             <i aria-hidden="true" class="fa fa-phone" />
             <span class="plugin-conference-joinbutton">{{ joinButtonText }}</span>
         </div>