diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index c53fde76c..0143a1b6c 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -63,6 +63,10 @@
                 stopInfo.LiveStreamId = state.PlayState.LiveStreamId;
             }
 
+            if (state.PlayState.PlaySessionId) {
+                stopInfo.PlaySessionId = state.PlayState.PlaySessionId;
+            }
+
             ApiClient.reportPlaybackStopped(stopInfo);
 
         }).on('positionchange.mediacontroller', function (e, state) {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 455ad2d8d..6ef491ad5 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -1398,6 +1398,7 @@
                         'Transcode';
 
                     state.PlayState.LiveStreamId = getParameterByName('LiveStreamId', currentSrc);
+                    state.PlayState.PlaySessionId = getParameterByName('PlaySessionId', currentSrc);
                 }
             }
 
diff --git a/dashboard-ui/thirdparty/apiclient/connectionmanager.js b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
index 46b303761..c56402612 100644
--- a/dashboard-ui/thirdparty/apiclient/connectionmanager.js
+++ b/dashboard-ui/thirdparty/apiclient/connectionmanager.js
@@ -455,7 +455,10 @@
         self.isLoggedIntoConnect = function () {
 
             // Make sure it returns true or false
-            return (self.connectToken() && self.connectUserId()) == true;
+            if (!self.connectToken() || !self.connectUserId()) {
+                return false;
+            }
+            return true;
         };
 
         self.logout = function () {