diff --git a/app/components/public/session-item.hbs b/app/components/public/session-item.hbs
index daf02975099..2038f919b19 100644
--- a/app/components/public/session-item.hbs
+++ b/app/components/public/session-item.hbs
@@ -6,10 +6,10 @@
         {{@session.title}}
         <span style={{css float='right'}}>
           {{#if @session.microlocation.videoStream}}
-            <a role="button" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank"
-              style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} rel="noopener" {{action this.goToStream}}>
-              <i class="video icon"></i>
-            </a>
+            <button class="ui basic {{text-color @session.track.color 'basic' 'inverted'}} button" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}} {{action this.goToStream}}>
+              <i class="icon video"></i>
+              {{t 'Join Video'}}
+            </button>
           {{/if}}
           {{#unless @hideSessionLink}}
             <a role="button" href="{{href-to 'public.session.view' (or @event.identifier @session.event.identifier) @session.id}}" style={{css color=(text-color @session.track.color 'grey' 'lightgrey')}}><i class="share icon"></i></a>
@@ -90,8 +90,26 @@
       </div>
     {{/if}}
 
-    {{#if @session.microlocation.videoStream.additionalInformation}}
+    {{#if @session.microlocation.videoStream}}
       <p style="white-space: pre-line;">
+        <a class="mt-2" href="{{href-to 'public.stream.view' (or @event.identifier @session.event.identifier) @session.microlocation.videoStream}}" target="_blank" rel="noopener">{{t 'Join Video Channel'}}</a>
+        {{#if @session.microlocation.videoStream.password}}
+          <div class="d-flex items-center">
+            <span>{{t 'Password'}}: </span>
+            <UiPopup @on="click" @content={{t "Copied to clipboard"}} @position="bottom right" style="white-space: normal;">
+              <CopyButton @clipboardText={{@session.microlocation.videoStream.password}} class="ui basic segments">
+                <div class="ui left labeled button">
+                  <div class="ui basic label">
+                    {{@session.microlocation.videoStream.password}}
+                  </div>
+                  <div class="ui icon button">
+                    <i class="copy icon"></i>
+                  </div>
+                </div>
+              </CopyButton>
+            </UiPopup>
+          </div>
+        {{/if}}
         {{@session.microlocation.videoStream.additionalInformation}}
       </p>
     {{/if}}
diff --git a/app/components/public/stream/video-stream.ts b/app/components/public/stream/video-stream.ts
index f4a584fb44d..ae9c58384cd 100644
--- a/app/components/public/stream/video-stream.ts
+++ b/app/components/public/stream/video-stream.ts
@@ -69,6 +69,8 @@ export default class PublicStreamVideoStream extends Component<Args> {
     (this.app as HTMLElement).innerHTML = '';
     const api = new window.JitsiMeetExternalAPI(domain, options);
 
+    api.executeCommand('subject', stream.name);
+
     if (stream.password) {
       api.addEventListener('participantRoleChanged', (event: any) => {
         if (event.role === 'moderator') {
diff --git a/app/styles/libs/_helpers.scss b/app/styles/libs/_helpers.scss
index b4181e234f5..de4c98df21c 100644
--- a/app/styles/libs/_helpers.scss
+++ b/app/styles/libs/_helpers.scss
@@ -70,3 +70,11 @@ $spacer-heights: 50 100 200 300 400 500 600 700 800 900;
 .d-inline {
   display: inline;
 }
+
+.d-inline-block {
+  display: inline-block;
+}
+
+.items-center {
+  align-items: center;
+}