diff --git a/meshdesktopmultiplex.js b/meshdesktopmultiplex.js
index 7e53742d..6da52609 100644
--- a/meshdesktopmultiplex.js
+++ b/meshdesktopmultiplex.js
@@ -133,7 +133,22 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
 
             // Check session recording
             var startRecord = false;
-            if ((typeof domain.sessionrecording == 'object') && (domain.sessionrecording.onlyselectedusers === true) && (peer.user != null) && (peer.user.flags != null) && ((peer.user.flags & 2) != 0)) { startRecord = true; }
+            if (typeof domain.sessionrecording == 'object') {
+                // Check if this user is set to record all sessions
+                if ((domain.sessionrecording.onlyselectedusers === true) && (peer.user != null) && (peer.user.flags != null) && ((peer.user.flags & 2) != 0)) { startRecord = true; }
+                else if (domain.sessionrecording.onlyselectedusergroups === true) {
+                    // Check if there is a usergroup that requires recording of the session
+                    var user = parent.users[peer.user._id];
+                    if ((user != null) && (user.links != null) && (user.links[obj.meshid] == null) && (user.links[obj.nodeid] == null)) {
+                        // This user does not have a direct link to the device group or device. Find all user groups the would cause the link.
+                        for (var i in user.links) {
+                            var ugrp = parent.userGroups[i];
+                            if ((ugrp != null) && (typeof ugrp.flags == 'number') && ((ugrp.flags & 2) != 0) && (ugrp.links != null) && ((ugrp.links[obj.meshid] != null) || (ugrp.links[obj.nodeid] != null))) { startRecord = true; }
+                        }
+                    }
+                }
+            }
+
             startRecording(domain, startRecord, function () {
                 // Indicated we are connected
                 obj.sendToViewer(peer, obj.recordingFile ? 'cr' : 'c');
@@ -810,6 +825,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
         });
     }
 
+    // Here, we check if we have to record the device, regardless of what user is looking at it.
     function recordingSetup(domain, func) {
         var record = false;
 
@@ -818,8 +834,8 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
             record = true;
 
             // Check again to make sure we need to start recording
-            if ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.onlyselecteddevicegroups === true) || (domain.sessionrecording.onlyselectedusers === true))) {
-                record = false;    
+            if ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.onlyselecteddevicegroups === true) || (domain.sessionrecording.onlyselectedusergroups === true) || (domain.sessionrecording.onlyselectedusers === true))) {
+                record = false;
 
                 // Check device group recording
                 if (domain.sessionrecording.onlyselecteddevicegroups === true) {
@@ -828,7 +844,6 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
                 }
             }
         }
-
         startRecording(domain, record, func);
     }
 
diff --git a/meshrelay.js b/meshrelay.js
index 11a0bb98..d60e33ea 100644
--- a/meshrelay.js
+++ b/meshrelay.js
@@ -348,27 +348,41 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
                         recordSession = true;
                         xtextSession = 2; // 1 = Raw recording of all strings, 2 = Record chat session messages only.
                     }
+                    // See if any other recording may occur
                     if ((obj.req.query.p != null) && (obj.req.query.nodeid != null) && (sessionUser != null) && (domain.sessionrecording == true || ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.protocols == null) || (domain.sessionrecording.protocols.indexOf(parseInt(obj.req.query.p)) >= 0))))) { recordSession = true; }
-                    
+
                     if (recordSession) {
                         // Get the computer name
                         parent.db.Get(obj.req.query.nodeid, function (err, nodes) {
                             var xusername = '', xdevicename = '', xdevicename2 = null, node = null, record = true;
                             if ((nodes != null) && (nodes.length == 1)) { node = nodes[0]; xdevicename2 = node.name; xdevicename = '-' + parent.common.makeFilename(node.name); }
 
-                            // Check again if we need to do messenger recording
-                            if ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.onlyselectedusers === true) || (domain.sessionrecording.onlyselecteddevicegroups === true))) {
+                            // Check again if we need to do session recording
+                            if ((typeof domain.sessionrecording == 'object') && ((domain.sessionrecording.onlyselectedusers === true) || (domain.sessionrecording.onlyselectedusergroups === true) || (domain.sessionrecording.onlyselecteddevicegroups === true))) {
                                 record = false;
 
-                                // Check if this device group needs to be recorded
-                                if ((node == null) || (domain.sessionrecording.onlyselecteddevicegroups === true)) {
-                                    var mesh = null;
-                                    if (node != null) { mesh = parent.meshes[node.meshid]; }
-                                    if ((node != null) && (mesh != null) && (mesh.flags != null) && ((mesh.flags & 4) != 0)) { record = true; }
+                                // Check if this user needs to be recorded
+                                if ((sessionUser != null) && (domain.sessionrecording.onlyselectedusers === true)) {
+                                    if ((sessionUser.flags != null) && ((sessionUser.flags & 2) != 0)) { record = true; }
                                 }
 
-                                // Check if this user needs to be recorded
-                                if ((sessionUser != null) && (sessionUser.flags != null) && ((sessionUser.flags & 2) != 0)) { record = true; }
+                                // Check if this device group needs to be recorded
+                                if ((record == false) && (node != null) && (domain.sessionrecording.onlyselecteddevicegroups === true)) {
+                                    var mesh = parent.meshes[node.meshid];
+                                    if ((mesh != null) && (mesh.flags != null) && ((mesh.flags & 4) != 0)) { record = true; }
+                                }
+
+                                // Check if any user groups need to be recorded
+                                if ((record == false) && (domain.sessionrecording.onlyselectedusergroups === true)) {
+                                    // Check if there is a usergroup that requires recording of the session
+                                    if ((sessionUser != null) && (sessionUser.links != null) && (sessionUser.links[node.meshid] == null) && (sessionUser.links[node._id] == null)) {
+                                        // This user does not have a direct link to the device group or device. Find all user groups the would cause the link.
+                                        for (var i in sessionUser.links) {
+                                            var ugrp = parent.userGroups[i];
+                                            if ((ugrp != null) && (typeof ugrp.flags == 'number') && ((ugrp.flags & 2) != 0) && (ugrp.links != null) && ((ugrp.links[node.meshid] != null) || (ugrp.links[node._id] != null))) { record = true; }
+                                        }
+                                    }
+                                }
                             }
 
                             // Do not record the session, just send session start
diff --git a/views/default.handlebars b/views/default.handlebars
index cd929084..5aba1e7e 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -10021,7 +10021,7 @@
 
                     var msg;
                     if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
-                        msg = EscapeHtml(event.msg).split('(R)').join('®');
+                        if (typeof event.msg == 'string') { msg = EscapeHtml(event.msg).split('(R)').join('®'); } else { msg = ''; }
                     } else {
                         msg = eventsMessageId[event.msgid];
                         for (var i in event.msgArgs) {
@@ -14676,7 +14676,7 @@
 
                     var msg;
                     if ((event.msgid == null) || (eventsMessageId[event.msgid] == null)) {
-                        msg = EscapeHtml(event.msg).split('(R)').join('®');
+                        if (typeof event.msg == 'string') { msg = EscapeHtml(event.msg).split('(R)').join('®'); } else { msg = ''; }
                     } else {
                         msg = eventsMessageId[event.msgid];
                         for (var i in event.msgArgs) {