diff --git a/Myrtille.Web/App_Start/BundleConfig.cs b/Myrtille.Web/App_Start/BundleConfig.cs
index 3acb770..0c066f9 100644
--- a/Myrtille.Web/App_Start/BundleConfig.cs
+++ b/Myrtille.Web/App_Start/BundleConfig.cs
@@ -42,6 +42,7 @@ public static void RegisterBundles(BundleCollection bundles)
             bundles.Add(new Bundle("~/js/xterm/xterm.js").Include("~/js/xterm/xterm.js"));
             bundles.Add(new Bundle("~/js/xterm/addons/fit/fit.js").Include("~/js/xterm/addons/fit/fit.js"));
             bundles.Add(new Bundle("~/js/audio/audiowebsocket.js").Include("~/js/audio/audiowebsocket.js"));
+            bundles.Add(new Bundle("~/js/securden.js").Include("~/js/securden.js"));
 
             // styles
 
@@ -49,6 +50,7 @@ public static void RegisterBundles(BundleCollection bundles)
 
             bundles.Add(new Bundle("~/css/Default.css").Include("~/css/Default.css"));
             bundles.Add(new Bundle("~/css/xterm.css").Include("~/css/xterm.css"));
+            bundles.Add(new Bundle("~/css/securden.css").Include("~/css/securden.css"));
         }
     }
 }
\ No newline at end of file
diff --git a/Myrtille.Web/Default.aspx b/Myrtille.Web/Default.aspx
index b38e08e..1f51c86 100644
--- a/Myrtille.Web/Default.aspx
+++ b/Myrtille.Web/Default.aspx
@@ -35,11 +35,12 @@
         <!-- mobile devices -->
         <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0"/>
         
-        <title>RDP Session<%=RemoteSession != null && !RemoteSession.ConnectionService && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected) && !string.IsNullOrEmpty(RemoteSession.ServerAddress) ? " - " + RemoteSession.ServerAddress.ToString() : ""%></title>
+        <title>RDP Session<%=RemoteSession != null && !RemoteSession.ConnectionService && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected) && !string.IsNullOrEmpty(RemoteSession.ServerAddress) ? (" - " + ((!string.IsNullOrEmpty(RemoteSession.UserDomain))? RemoteSession.UserDomain.ToString() + "\\" : "") + RemoteSession.UserName.ToString() + "@" + RemoteSession.ServerAddress.ToString()) : ""%></title>
         
         <link rel="icon" type="image/x-icon" href="favicon.ico"/>
         <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/Default.css", true)%>"/>
         <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/xterm.css", true)%>"/>
+        <link rel="stylesheet" type="text/css" href="<%=BundleTable.Bundles.ResolveBundleUrl("~/css/securden.css", true)%>"/>
 
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/tools/common.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/tools/convert.js", true)%>"></script>
@@ -62,6 +63,7 @@
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/xterm/xterm.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/xterm/addons/fit/fit.js", true)%>"></script>
         <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/audio/audiowebsocket.js", true)%>"></script>
+        <script language="javascript" type="text/javascript" src="<%=BundleTable.Bundles.ResolveBundleUrl("~/js/securden.js", true)%>"></script>
 
 	</head>
 	
@@ -249,7 +251,7 @@
 			    <img src="img/icons8-menu-horizontal-21.png" alt="show/hide toolbar" width="21px" height="21px" onclick="toggleToolbar();"/>
             </div>
 
-            <div runat="server" id="toolbar" visible="false" style="visibility:hidden;display:none;">
+            <div runat="server" id="toolbar" visible="False" style="visibility:hidden;display:none;">
 
                 <!-- server info -->
                 <input type="text" runat="server" id="serverInfo" title="connected server" disabled="disabled"/>
@@ -312,6 +314,50 @@
 
         </form>
 
+        <!-- Securden start block -->
+        <form id="dummy_form" action="/" method="post">
+            <input type="hidden" id="dummy_data" value=""/>
+        </form>
+
+        <div runat="server" id="certificateDiv" visible="False">
+            Certificate accepted.
+        </div>
+
+        <div runat="server" id="loadingDiv" visible="False">
+            <div class="sec-loading-wrap">
+                <div class="sec-loading-circle">
+                  <label>●</label>
+                  <label>●</label>
+                  <label>●</label>
+                  <label>●</label>
+                  <label>●</label>
+                  <label>●</label>
+                </div>
+                <div class="loading-text">Loading...</div>
+            </div>
+        </div>
+
+        <div class="container webrdp-container-body" style="display:none;" id="errorMessageDialogEle">
+            <div id="status" class="error-message-div">
+            <span id="webrdp-error-icon" class="webrdp-error-icon"></span>
+            <span id="webrdp-error-text" class="webrdp-error-text">Connection failed.</span>
+            <span id="webrdp-back-home-btn" class="webrdp-back-btn" onclick="window.close();">Close</span>
+            </div>
+        </div>
+
+        <div runat="server" id="remoteOperationsDivWrap" visible="False">
+          <div runat="server" id="remoteOperationsDiv">
+            <div id="remoteOperationsHeader" title="Click to move"><p>. . .</p><p>. . .</p></div>
+            <div class="remote-oper-label-text" onclick="sendCtrlAltDel();">Ctrl+Alt+Delete</div>
+            <div class="remote-oper-label-text" onclick="openPopup('pasteClipboardPopup', 'PasteClipboard.aspx');">Clipboard</div>
+            <div class="remote-oper-label-text" onclick="disconnectSession();">Disconnect</div>
+          </div>
+          <script type="text/javascript">
+            dragElement(document.getElementById("remoteOperationsDiv"));
+          </script>
+        </div>
+        <!-- Securden end block -->
+
         <script type="text/javascript" language="javascript" defer="defer">
 
             initDisplay();
@@ -469,4 +515,4 @@
 
 	</body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
index 029330b..33c04bc 100644
--- a/Myrtille.Web/Default.aspx.cs
+++ b/Myrtille.Web/Default.aspx.cs
@@ -114,7 +114,7 @@ protected void Page_Init(
             }
 
             // connect from a login page or url
-            if (!bool.TryParse(ConfigurationManager.AppSettings["LoginEnabled"], out _loginEnabled) || Request.RawUrl.Contains("auth_key"))
+            if (!bool.TryParse(ConfigurationManager.AppSettings["LoginEnabled"], out _loginEnabled) || (Request.RawUrl.Contains("auth_key") && Request.RawUrl.Contains("referrer")))
             {
                 _loginEnabled = true;
             }
@@ -236,6 +236,10 @@ protected void Page_Load(
 
                             ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), script, true);
                         }
+                        else
+                        {
+                            Response.Write("<script>alert('Session closed.'); window.close();</script>");
+                        }
 
                         // cleanup
                         Session[HttpSessionStateVariables.RemoteSession.ToString()] = null;
@@ -314,6 +318,11 @@ protected void Page_Load(
             // disable the browser cache; in addition to a "noCache" dummy param, with current time, on long-polling and xhr requests
             Response.Cache.SetCacheability(HttpCacheability.NoCache);
             Response.Cache.SetNoStore();
+
+            if (RemoteSession == null && (string.IsNullOrEmpty(Request["auth_key"]) || string.IsNullOrEmpty(Request["referrer"])))
+            {
+                certificateDiv.Visible = true;
+            }
         }
 
         /// <summary>
@@ -341,6 +350,16 @@ private void UpdateControls()
             // remote session toolbar
             if (RemoteSession != null && (RemoteSession.State == RemoteSessionState.Connecting || RemoteSession.State == RemoteSessionState.Connected))
             {
+                remoteOperationsDivWrap.Visible = true;
+                if (RemoteSession.State == RemoteSessionState.Connecting)
+                {
+                    loadingDiv.Visible = true;
+                    remoteOperationsDiv.Style.Add("display", "none");
+                }
+                else
+                {
+                    remoteOperationsDiv.Style.Add("display", "block");
+                }
                 if (_toolbarEnabled)
                 {
                     // interacting with the remote session is available to guests with control access, but only the remote session owner should have control on the remote session itself
@@ -380,7 +399,7 @@ private void UpdateControls()
             else
             {
                 // connection params are sent when the login form is submitted, either through http post (the default form method) or http get (querystring)
-                login.Visible = _loginEnabled;
+                //login.Visible = _loginEnabled;
 
                 // MFA
                 if (_mfaAuthClient.GetState())
@@ -562,11 +581,11 @@ private JObject ProcessLaunchRequest(string serverUrl, string authKey)
             {
                 if ((string)response["type"] == "WEB_RDP")
                 {
-                    returnObj = (JObject)response["details"];
+                    returnObj = response;
                 }
                 else
                 {
-                    Response.Write("<script>alert('Invalid option'); window.close();</script>");
+                    Response.Write("<script>alert('Invalid option.'); window.close();</script>");
                 }
             }
             else
@@ -602,7 +621,9 @@ private bool ConnectRemoteServer()
                 Response.Write("<script>alert('Invalid command.'); window.close();</script>");
                 return false;
             }
-            else if (RemoteSession == null)
+            long userProfileId = 0;
+            long userSessionId = 0;
+            if (RemoteSession == null)
             {
                 JObject connectionDetails = ProcessLaunchRequest(Request["referrer"], Request["auth_key"]);
                 if (connectionDetails == null)
@@ -611,6 +632,9 @@ private bool ConnectRemoteServer()
                 }
                 else
                 {
+                    //userProfileId = (long)connectionDetails["user_profile_id"];
+                    //userSessionId = (long)connectionDetails["user_session_id"];
+                    connectionDetails = (JObject)connectionDetails["details"];
                     loginServer = (string)connectionDetails["address"];
                     loginDomain = "";
                     loginUser = (string)connectionDetails["username"];
@@ -762,12 +786,16 @@ private bool ConnectRemoteServer()
                     Request["cid"] != null
                 );
 
+                RemoteSession.UserProfileId = userProfileId;
+                RemoteSession.UserSessionId = userSessionId;
+
                 // bind the remote session to the current http session
                 Session[HttpSessionStateVariables.RemoteSession.ToString()] = RemoteSession;
 
                 // register the remote session at the application level
                 var remoteSessions = (IDictionary<Guid, RemoteSession>)Application[HttpApplicationStateVariables.RemoteSessions.ToString()];
                 remoteSessions.Add(RemoteSession.Id, RemoteSession);
+
             }
             catch (Exception exc)
             {
diff --git a/Myrtille.Web/Default.aspx.designer.cs b/Myrtille.Web/Default.aspx.designer.cs
index 172ae1e..3702028 100644
--- a/Myrtille.Web/Default.aspx.designer.cs
+++ b/Myrtille.Web/Default.aspx.designer.cs
@@ -407,5 +407,41 @@ public partial class Default {
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlInputButton disconnect;
+        
+        /// <summary>
+        /// certificateDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl certificateDiv;
+        
+        /// <summary>
+        /// loadingDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl loadingDiv;
+        
+        /// <summary>
+        /// remoteOperationsDivWrap control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl remoteOperationsDivWrap;
+        
+        /// <summary>
+        /// remoteOperationsDiv control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlGenericControl remoteOperationsDiv;
     }
 }
diff --git a/Myrtille.Web/Myrtille.Web.csproj b/Myrtille.Web/Myrtille.Web.csproj
index 147042c..1de5402 100644
--- a/Myrtille.Web/Myrtille.Web.csproj
+++ b/Myrtille.Web/Myrtille.Web.csproj
@@ -260,6 +260,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="css\securden.css" />
     <Content Include="css\xterm.css" />
     <Content Include="favicon.ico" />
     <Content Include="GetHash.aspx" />
@@ -274,6 +275,7 @@
     <Content Include="js\display\canvas.js" />
     <Content Include="js\display\divs.js" />
     <Content Include="js\display\terminaldiv.js" />
+    <Content Include="js\securden.js" />
     <Content Include="js\network\websocket.js" />
     <Content Include="js\tools\convert.js" />
     <Content Include="js\tools\common.js" />
diff --git a/Myrtille.Web/Web.Base.config b/Myrtille.Web/Web.Base.config
index d273fcb..a18bd85 100644
--- a/Myrtille.Web/Web.Base.config
+++ b/Myrtille.Web/Web.Base.config
@@ -183,9 +183,9 @@
     <!-- if the browser window/tab of the remote session owner is closed without disconnecting first, or if the connection is lost, delay (ms) before the remote session is disconnected by the gateway. value must be greater than "browserPulseInterval" defined into config.js (default 10 secs). 0 to disable -->
     <add key="ClientIdleTimeout" value="30000"/>
     <!-- audio buffer. improves the audio quality at the expense of a slight latency -->
-    <add key="AudioBuffering" value="true"/>
+    <add key="AudioBuffering" value="false"/>
     <!-- show or hide the toolbar (you can hide it if using your own UI) -->
-    <add key="ToolbarEnabled" value="true"/>
+    <add key="ToolbarEnabled" value="false"/>
     <!-- connect from a login page or url (you can disable it if using a connection API) -->
     <add key="LoginEnabled" value="false"/>
     <!-- if login is enabled, url of the login page (change it if using your own page or leave empty to use the default page) -->
diff --git a/Myrtille.Web/Web.config b/Myrtille.Web/Web.config
index f1add6a..fb29592 100644
--- a/Myrtille.Web/Web.config
+++ b/Myrtille.Web/Web.config
@@ -183,9 +183,9 @@
     <!-- if the browser window/tab of the remote session owner is closed without disconnecting first, or if the connection is lost, delay (ms) before the remote session is disconnected by the gateway. value must be greater than "browserPulseInterval" defined into config.js (default 10 secs). 0 to disable -->
     <add key="ClientIdleTimeout" value="30000"/>
     <!-- audio buffer. improves the audio quality at the expense of a slight latency -->
-    <add key="AudioBuffering" value="true"/>
+    <add key="AudioBuffering" value="false"/>
     <!-- show or hide the toolbar (you can hide it if using your own UI) -->
-    <add key="ToolbarEnabled" value="true"/>
+    <add key="ToolbarEnabled" value="false"/>
     <!-- connect from a login page or url (you can disable it if using a connection API) -->
     <add key="LoginEnabled" value="false"/>
     <!-- if login is enabled, url of the login page (change it if using your own page or leave empty to use the default page) -->
diff --git a/Myrtille.Web/css/securden.css b/Myrtille.Web/css/securden.css
new file mode 100644
index 0000000..5a5fa21
--- /dev/null
+++ b/Myrtille.Web/css/securden.css
@@ -0,0 +1,237 @@
+.container.webrdp-container-body {
+    position: relative;
+    text-align: center;
+}
+
+span.webrdp-error-icon {
+    position: absolute;
+    width: 27px;
+    height: 27px;
+    opacity: 1;
+    background-color: #ff5353;
+    border-radius: 50px;
+    margin: 11px 0 0 5px;
+    left: 40px;
+    top: 21px;
+}
+
+    span.webrdp-error-icon:before, span.webrdp-error-icon:after {
+        position: absolute;
+        content: ' ';
+        height: 15px;
+        width: .139rem;
+        background-color: #ffffff;
+        top: 6px;
+        left: 12.5px;
+    }
+
+    span.webrdp-error-icon:after {
+        transform: rotate(-45deg);
+    }
+
+    span.webrdp-error-icon:before {
+        transform: rotate(45deg);
+    }
+
+.webrdp-back-btn:hover {
+    background-color: #e92a2a;
+}
+
+.error-message-div {
+    z-index: 100;
+    color: #fff;
+    text-align: center;
+    display: inline-block;
+    margin: 0 auto;
+    position: relative;
+    background-color: #eee;
+    padding: 32px 60px 30px 90px;
+    border-radius: 4px;
+    margin-top: 150px;
+    min-height: 90px;
+    font-size: 18px;
+    border: 1px solid #ccc;
+    box-shadow: 0px 0px 30px rgba(169, 169, 169, .5);
+}
+
+span.webrdp-error-text {
+    display: block;
+    color: #222222;
+    font-weight: 500;
+}
+
+.webrdp-back-btn {
+    margin: 20px 0 0 -30px;
+    background-color: #ff5353;
+    display: inline-block;
+    padding: 5px 15px;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 15px;
+}
+
+.label-text {
+    float: left;
+    line-height: 40px;
+    background-color: #f1f1f1;
+    text-align: center;
+    width: 130px;
+    cursor: pointer;
+}
+
+    .label-text:hover {
+        color: #000000;
+        background-color: #eeeeee;
+    }
+
+.sec-loading-wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    transform: translateY(-50%);
+    width: calc(100% - 200px);
+    color: #ffffff;
+    padding: 0 100px;
+    text-align: center;
+    bottom: 0;
+    margin: auto;
+    height: 70px;
+}
+
+.sec-loading-circle {
+  margin-top: 10px;
+}
+
+.sec-loading-circle label {
+  font-size: 20px;
+  opacity: 0;
+  display:inline-block;
+}
+.loading-text {
+    width: 100%;
+    text-align: center;
+    font-size: 22px;
+    margin-top: 10px;
+}
+@keyframes connecting {
+  0% {
+    opacity: 0;
+    transform: translateX(-300px);
+  }
+  33% {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+  66% {
+    opacity: 1;
+    transform: translateX(0px);
+  }
+  100% {
+    opacity: 0;
+    transform: translateX(300px);
+  }
+}
+
+@-webkit-keyframes connecting {
+  0% {
+    opacity: 0;
+    -webkit-transform: translateX(-300px);
+  }
+  33% {
+    opacity: 1;
+    -webkit-transform: translateX(0px);
+  }
+  66% {
+    opacity: 1;
+    -webkit-transform: translateX(0px);
+  }
+  100% {
+    opacity: 0;
+    -webkit-transform: translateX(300px);
+  }
+}
+
+.sec-loading-circle label:nth-child(6) {
+  -webkit-animation: connecting 3s infinite ease-in-out;
+  animation: connecting 3s infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(5) {
+  -webkit-animation: connecting 3s 100ms infinite ease-in-out;
+  animation: connecting 3s 100ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(4) {
+  -webkit-animation: connecting 3s 200ms infinite ease-in-out;
+  animation: connecting 3s 200ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(3) {
+  -webkit-animation: connecting 3s 300ms infinite ease-in-out;
+  animation: connecting 3s 300ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(2) {
+  -webkit-animation: connecting 3s 400ms infinite ease-in-out;
+  animation: connecting 3s 400ms infinite ease-in-out;
+}
+
+.sec-loading-circle label:nth-child(1) {
+  -webkit-animation: connecting 3s 500ms infinite ease-in-out;
+  animation: connecting 3s 500ms infinite ease-in-out;
+}
+
+#remoteOperationsDiv {
+    position: absolute;
+    z-index: 1000;
+    text-align: center;
+    border: 1px solid #d3d3d3;
+    width: 125px;
+    top: 10px;
+    opacity: .6;
+    top: 38%;
+    right: 10px;
+}
+
+    #remoteOperationsDiv:hover {
+        opacity: 1;
+    }
+
+#remoteOperationsHeader {
+    padding: 2px 0;
+    cursor: move;
+    z-index: 10;
+    background-color: #2196F3;
+    color: #fff;
+    float: left;
+    height: 24px;
+    box-sizing: border-box;
+    margin-top: -1px;
+    width: 100%;
+    border-bottom: 1px solid #eee;
+}
+
+    #remoteOperationsHeader p {
+        position: relative;
+        float: left;
+        width: 100%;
+        line-height: 7px;
+        padding: 0;
+        margin: 0;
+        letter-spacing: 3px;
+    }
+
+.remote-oper-label-text {
+    float: left;
+    line-height: 40px;
+    background-color: #f1f1f1;
+    text-align: center;
+    width: 100%;
+    font-size: 14px;
+    cursor: pointer;
+}
+
+    .remote-oper-label-text:hover {
+        color: #ffffff;
+        background-color: #2096f3;
+    }
diff --git a/Myrtille.Web/js/config.js b/Myrtille.Web/js/config.js
index 598f8ad..bfc2bbf 100644
--- a/Myrtille.Web/js/config.js
+++ b/Myrtille.Web/js/config.js
@@ -136,7 +136,7 @@ function Config(
     var adaptiveFullscreenTimeout = 0;                              // adaptive fullscreen update (ms); requested after a given period of user inactivity (=no input). 0 to disable
 
     // audio
-    var audioFormat = audioFormatEnum.MP3;                          // audio format (HTML5); requires websocket enabled and RDP host; IE doesn't support WAV format (MP3 fallback); others: WAV and MP3 support
+    var audioFormat = audioFormatEnum.NONE;                          // audio format (HTML5); requires websocket enabled and RDP host; IE doesn't support WAV format (MP3 fallback); others: WAV and MP3 support
     var audioBitrate = 128;                                         // bitrate (kbps); possible values for WAV: 1411 (44100 Hz, 16 bits stereo); possible values for MP3: 128, 160, 256, 320 (CBR); lower = lesser quality, but also less bandwidth usage (128 kbps is good enough for sound notifications)
 
     // network
diff --git a/Myrtille.Web/js/display/canvas.js b/Myrtille.Web/js/display/canvas.js
index 42dbf8e..392f72d 100644
--- a/Myrtille.Web/js/display/canvas.js
+++ b/Myrtille.Web/js/display/canvas.js
@@ -51,6 +51,7 @@ function Canvas(base, config, dialog, display)
 
                 // set a tab index so the canvas can be focused
                 canvasObject.setAttribute('tabindex', 0);
+                canvasObject.id = "canvasDisplayEle";
 
                 // disable drag & drop
                 canvasObject.setAttribute('draggable', false);
diff --git a/Myrtille.Web/js/myrtille.js b/Myrtille.Web/js/myrtille.js
index 55f7338..641b4c0 100644
--- a/Myrtille.Web/js/myrtille.js
+++ b/Myrtille.Web/js/myrtille.js
@@ -602,7 +602,7 @@ this.sendChar = function(char, release)
     }
 }
 
-this.sendCtrlAltDel = function()
+this.sendCtrlAltDel = function ()
 {
     try
     {
@@ -787,6 +787,7 @@ this.doDisconnect = function()
     {
         disableToolbar();
         network.send(myrtille.getCommandEnum().CLOSE_CLIENT.text);
+        closeTab();
     }
     catch (exc)
     {
diff --git a/Myrtille.Web/js/network/websocket.js b/Myrtille.Web/js/network/websocket.js
index 68aca93..90c9d1b 100644
--- a/Myrtille.Web/js/network/websocket.js
+++ b/Myrtille.Web/js/network/websocket.js
@@ -307,6 +307,7 @@ function Websocket(base, config, dialog, display, network)
                 // connected session
                 else if (text == 'connected')
                 {
+                    onSessionConnection();
                     // if running myrtille into an iframe, register the iframe url (into a cookie)
                     // this is necessary to prevent a new http session from being generated when reloading the page, due to the missing http session id into the iframe url (!)
                     // multiple iframes (on the same page), like multiple connections/tabs, requires cookieless="UseUri" for sessionState into web.config
@@ -328,7 +329,8 @@ function Websocket(base, config, dialog, display, network)
                     }
 
                     // back to default page
-                    window.location.href = config.getHttpServerUrl();
+                    onSessionDisconnection();
+                    //window.location.href = config.getHttpServerUrl();
                 }
                 // server ack
                 else if (text.length >= 4 && text.substr(0, 4) == 'ack,')
diff --git a/Myrtille.Web/js/securden.js b/Myrtille.Web/js/securden.js
new file mode 100644
index 0000000..f8922f6
--- /dev/null
+++ b/Myrtille.Web/js/securden.js
@@ -0,0 +1,130 @@
+var disableUserClose = true;
+var isSessionConnected = false;
+
+window.onbeforeunload = function (evt) {
+    if (disableUserClose) {
+        return "Do you want to close tab?";
+    }
+}
+
+window.onunload = function (evt) {
+    alert(isSessionConnected);
+    if (isSessionConnected) {
+        doDisconnect();
+    }
+}
+
+function hideLoadingDiv() {
+    if (document.getElementById('loadingDiv')) {
+        document.getElementById('loadingDiv').style.display = 'none';
+    }
+}
+
+function showRemoteOperationsDiv() {
+    if (document.getElementById('remoteOperationsDiv')) {
+        document.getElementById('remoteOperationsDiv').style.display = 'block';
+    }
+}
+
+function hideRemoteOperationsDiv() {
+    if (document.getElementById('remoteOperationsDiv')) {
+        document.getElementById('remoteOperationsDiv').style.display = 'none';
+    }
+}
+
+function showErrorMessage(message, hideCloseButton) {
+    hideLoadingDiv();
+    hideRemoteOperationsDiv();
+    if (message) {
+        document.getElementById("webrdp-error-text").innerText = message;
+    }
+    if (hideCloseButton) {
+        document.getElementById("webrdp-back-home-btn").style.display = "none";
+    }
+    document.getElementById("errorMessageDialogEle").style.display = "block";
+}
+
+function onSessionConnection() {
+    isSessionConnected = true;
+    hideLoadingDiv();
+    setTimeout(showRemoteOperationsDiv, 2000);
+}
+
+function onSessionDisconnection() {
+    disableUserClose = false;
+    if (!isSessionConnected && document.getElementById('loadingDiv')) {
+        showErrorMessage();
+    } else {
+        closeTab();
+    }
+}
+
+function disconnectSession() {
+    if (confirm("Do you want to disconnect the session? Note: The session won't be logged off.")) {
+        doDisconnect();
+    }
+}
+
+function closeTab() {
+    disableUserClose = false;
+    window.close();
+    hideLoadingDiv();
+    hideRemoteOperationsDiv();
+    showErrorMessage("Unexpected Error.", true);
+}
+
+function dragElement(elmnt) {
+    var clientWidth = window.innerWidth;
+    var clientHeight = window.innerHeight;
+
+    var pos1 = 0, pos2 = 0, pos3 = 0, pos4 = 0;
+    if (document.getElementById(elmnt.id + "header")) {
+        /* if present, the header is where you move the DIV from:*/
+        document.getElementById(elmnt.id + "header").onmousedown = dragMouseDown;
+    } else {
+        /* otherwise, move the DIV from anywhere inside the DIV:*/
+        elmnt.onmousedown = dragMouseDown;
+    }
+
+    function dragMouseDown(e) {
+        e = e || window.event;
+        e.preventDefault();
+        // get the mouse cursor position at startup:
+        pos3 = e.clientX;
+        pos4 = e.clientY;
+        document.onmouseup = closeDragElement;
+        // call a function whenever the cursor moves:
+        document.onmousemove = elementDrag;
+    }
+
+    function elementDrag(e) {
+        e = e || window.event;
+        e.preventDefault();
+        // calculate the new cursor position:
+        pos1 = pos3 - e.clientX;
+        pos2 = pos4 - e.clientY;
+        pos3 = e.clientX;
+        pos4 = e.clientY;
+        // set the element's new position:
+        var topPixel = (elmnt.offsetTop - pos2)
+        if (topPixel > (clientHeight - 145)) {
+            topPixel = clientHeight - 145;
+        } else if (topPixel < 0) {
+            topPixel = 0;
+        }
+        elmnt.style.top = topPixel + "px";
+        var leftPixel = (elmnt.offsetLeft - pos1)
+        if (leftPixel > (clientWidth-127)) {
+            leftPixel = clientWidth - 127;
+        } else if (leftPixel < 0) {
+            leftPixel = 0;
+        }
+        elmnt.style.left = leftPixel + "px";
+    }
+
+    function closeDragElement() {
+        /* stop moving when mouse button is released:*/
+        document.onmouseup = null;
+        document.onmousemove = null;
+    }
+}
diff --git a/Myrtille.Web/js/user/mouse.js b/Myrtille.Web/js/user/mouse.js
index 0e9fc7c..d7579cc 100644
--- a/Myrtille.Web/js/user/mouse.js
+++ b/Myrtille.Web/js/user/mouse.js
@@ -165,6 +165,9 @@ function Mouse(base, config, dialog, display, network, user)
             if (!processEvent(e))
                 return false;
 
+            if (e.target.id != "canvasDisplayEle")
+                return false;
+
             user.triggerActivity();
 
             // IE
diff --git a/Myrtille.Web/src/RemoteSession.cs b/Myrtille.Web/src/RemoteSession.cs
index 6ae2749..364248c 100644
--- a/Myrtille.Web/src/RemoteSession.cs
+++ b/Myrtille.Web/src/RemoteSession.cs
@@ -32,6 +32,9 @@ public class RemoteSession
     {
         public RemoteSessionManager Manager { get; private set; }
 
+        public long UserProfileId;
+        public long UserSessionId;
+
         public Guid Id;
         public RemoteSessionState State;
         public string HostName;