diff --git a/meshdesktopmultiplex.js b/meshdesktopmultiplex.js
index 6da52609..13fb3c38 100644
--- a/meshdesktopmultiplex.js
+++ b/meshdesktopmultiplex.js
@@ -797,7 +797,7 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
         if (start == false) { func(false); return; } // Just skip this
         obj.pendingRecording = 1;
         var now = new Date(Date.now());
-        var recFilename = 'desktopSession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth(), 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + '-' + obj.nodeid.split('/')[2] + '.mcrec'
+        var recFilename = 'desktopSession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + '-' + obj.nodeid.split('/')[2] + '.mcrec'
         var recFullFilename = null;
         if (domain.sessionrecording.filepath) {
             try { parent.parent.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }
diff --git a/meshrelay.js b/meshrelay.js
index 7447a454..b020796c 100644
--- a/meshrelay.js
+++ b/meshrelay.js
@@ -406,7 +406,7 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
                             var now = new Date(Date.now());
                             var xsessionid = obj.id;
                             if ((typeof xsessionid == 'string') && (xsessionid.startsWith('meshmessenger/node/') == true)) { xsessionid = 'Messenger' }
-                            var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth(), 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + xusername + xdevicename + '-' + xsessionid + (xtextSession ? '.txt' : '.mcrec');
+                            var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + parent.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + parent.common.zeroPad(now.getUTCDate(), 2) + '-' + parent.common.zeroPad(now.getUTCHours(), 2) + '-' + parent.common.zeroPad(now.getUTCMinutes(), 2) + '-' + parent.common.zeroPad(now.getUTCSeconds(), 2) + xusername + xdevicename + '-' + xsessionid + (xtextSession ? '.txt' : '.mcrec');
                             var recFullFilename = null;
                             if (domain.sessionrecording.filepath) {
                                 try { parent.parent.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }
diff --git a/views/sharing.handlebars b/views/sharing.handlebars
index 9d8d6486..0e71dfac 100644
--- a/views/sharing.handlebars
+++ b/views/sharing.handlebars
@@ -49,9 +49,9 @@
                     <div class='deskareaicon' title="Toggle View Mode" onclick="toggleAspectRatio(1)">&#8690;</div>
                     <div class='deskareaicon' title="Rotate Left" onclick="drotate(-1)">&olarr;</div>
                     <div class='deskareaicon' title="Rotate Right" onclick="drotate(1)">&orarr;</div>
-                    <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>
                     <input id="deskActionsSettings" type="button" value="Settings..." title="Edit remote desktop settings" onkeypress="return false" onkeydown="return false" onclick="showDesktopSettings()" class="mR" />
                     <div id="desktopCustomUiButtons" style="float:left"></div>
+                    <div id="deskRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px"></div>
                 </div>
                 <div>
                     <div id="idx_deskFullBtn2" onclick=deskToggleFull(event)>&nbsp;&#x2716;</div>
@@ -111,8 +111,8 @@
         </div>
         <div class="areaHead" style="position:absolute;top:0;left:0;right:0;height:24px">
             <div class="toright2">
-                <div id="p12power" style="margin-top:3px;margin-right:4px"></div>
                 <div id="termRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
+                <div id="p12power" style="margin-top:3px;margin-right:4px;float:right"></div>
             </div>
             <div>
                 <span id="connectbutton2span"><input type="button" id="connectbutton2" cmenu="termConnectButton" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled" /></span>
@@ -153,8 +153,8 @@
         <div id="p13toolbar" style="position:absolute;left:0;top:0;right:0;bottom:28px">
             <div class="areaHead">
                 <div class="toright2">
-                    <div id="p13power" style="margin-top:3px;margin-right:4px"></div>
                     <div id="filesRecordIcon" class='deskareaicon' title="Server is recording this session" style="display:none;background-color:red;width:12px;height:12px;border-radius:6px;margin-top:5px;margin-left:5px"></div>
+                    <div id="p13power" style="margin-top:3px;margin-right:4px;float:right"></div>
                 </div>
                 <div>
                     <input id=p13Connect value="Connect" onclick=connectFiles(event) type="button" />
diff --git a/webserver.js b/webserver.js
index 20ef97d1..97820e05 100644
--- a/webserver.js
+++ b/webserver.js
@@ -4018,7 +4018,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
 
                 if (record == true) {
                     var now = new Date(Date.now());
-                    var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + obj.common.zeroPad(now.getUTCMonth(), 2) + '-' + obj.common.zeroPad(now.getUTCDate(), 2) + '-' + obj.common.zeroPad(now.getUTCHours(), 2) + '-' + obj.common.zeroPad(now.getUTCMinutes(), 2) + '-' + obj.common.zeroPad(now.getUTCSeconds(), 2) + '-' + getRandomPassword() + '.mcrec'
+                    var recFilename = 'relaysession' + ((domain.id == '') ? '' : '-') + domain.id + '-' + now.getUTCFullYear() + '-' + obj.common.zeroPad(now.getUTCMonth() + 1, 2) + '-' + obj.common.zeroPad(now.getUTCDate(), 2) + '-' + obj.common.zeroPad(now.getUTCHours(), 2) + '-' + obj.common.zeroPad(now.getUTCMinutes(), 2) + '-' + obj.common.zeroPad(now.getUTCSeconds(), 2) + '-' + getRandomPassword() + '.mcrec'
                     var recFullFilename = null;
                     if (domain.sessionrecording.filepath) {
                         try { obj.fs.mkdirSync(domain.sessionrecording.filepath); } catch (e) { }