diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj
index b7613fc..1583c8c 100644
--- a/Global_Indexer/Global_Indexer.vbproj
+++ b/Global_Indexer/Global_Indexer.vbproj
@@ -295,12 +295,13 @@
     <Reference Include="IndexRange, Version=1.0.3.0, Culture=neutral, PublicKeyToken=35e6a3c4212514c6, processorArchitecture=MSIL">
       <HintPath>..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll</HintPath>
     </Reference>
-    <Reference Include="Interop.WINDREAMLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
+    <Reference Include="Interop.WINDREAMLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
     </Reference>
     <Reference Include="Interop.WMOTOOLLib">
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
+      <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Mail, Version=3.0.21189.1553, Culture=neutral, PublicKeyToken=6dc438ab78a525b3, processorArchitecture=MSIL">
@@ -749,6 +750,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmSQL_Admin.resx">
       <DependentUpon>frmSQL_Admin.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmSQL_DESIGNER.resx">
       <DependentUpon>frmSQL_DESIGNER.vb</DependentUpon>
diff --git a/Global_Indexer/frmSQL_DESIGNER.resx b/Global_Indexer/frmSQL_DESIGNER.resx
index 50dad6c..9e03143 100644
--- a/Global_Indexer/frmSQL_DESIGNER.resx
+++ b/Global_Indexer/frmSQL_DESIGNER.resx
@@ -130,49 +130,45 @@
   <data name="btnTestSQL.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAKhJREFUOE+dkb0RAiEQhSnFIgyMyckNLMI6zB0zS0FruBKugdMACFdWecoBw49v
-        5ku43W8eh7DWkmcxxhzFP2HB4bqnaZ7IS27OuU341BcW7E7bN5f7ebxNLGCG26QCENo0qQq01qSUIill
-        kaIAV+Dz0lJMJkhr89BjeRZZCeIfh8UamcDzfbphQRoIMITKYFhQoykogUUQ1n7pFYTxPBDUaAp6+EwL
-        8QKzYQ6as7QBdAAAAABJRU5ErkJggg==
+        wgAADsIBFShKgAAAAKNJREFUOE9j+Pbt2/9v3769//r1awEDOQBkQMy8iP+XHl36//Xr1/3fv39XQFeD
+        F4AMsOgyAePpB6aS7hpkA0CYZNegG4DmGoIYrwH79u377+vr+9/JyQkrxmoAzAsgcXQN6BjDAHRngxR9
+        eP8RK0YxADngiLEZwwDkqCPZAHSA7HQYje50kgzAhwkagA3DNMIwun6iDUDXBwfEBCJBA4jBMPUAs2EO
+        ml2cV2UAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnAddIndex.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
-        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
-        TkSuQmCC
+        wwAADsMBx2+oZAAAAFFJREFUOE/NkEsKACAIRD2b9z+PW9vF5AcyQRLewhl8RKSq1MEFVc4FRkTUgv2V
+        gJk3MwL7ZCtAUgEeZXwuaP0BTiTAfkZgwT4UvOCCKi6osgAjRH5TBg3ckAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnSaveSQLCommand.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFRJREFUOE9j+P//P0UYTHz79u0/Cfg9EBswAAGKAU5OTnD84f1HOEYWA9FtbW1w
-        Q8gyAIRhhpBtAAiD9BBlADJGVkNbA4jBowYMSgPIwXADyMf/GQC4A6rkpAjLjQAAAABJRU5ErkJggg==
+        wwAADsMBx2+oZAAAAFRJREFUOE9j+P//PwMlGEx8+/btPwn4/bdv3wwYGCB64QY4OTnB8Yf3H+EYWQxE
+        t7W1wQ0hywBkQ8g2AIRBeogyAJthtDeAGDxqwKA0gBwMN4ASDAC4A6rkvC7r4wAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnAddControl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
-        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
-        TkSuQmCC
+        wwAADsMBx2+oZAAAAFFJREFUOE/NkEsKACAIRD2b9z+PW9vF5AcyQRLewhl8RKSq1MEFVc4FRkTUgv2V
+        gJk3MwL7ZCtAUgEeZXwuaP0BTiTAfkZgwT4UvOCCKi6osgAjRH5TBg3ckAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnAddStatic.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
-        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
-        TkSuQmCC
+        wwAADsMBx2+oZAAAAFFJREFUOE/NkEsKACAIRD2b9z+PW9vF5AcyQRLewhl8RKSq1MEFVc4FRkTUgv2V
+        gJk3MwL7ZCtAUgEeZXwuaP0BTiTAfkZgwT4UvOCCKi6osgAjRH5TBg3ckAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnAddUser.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
-        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
-        TkSuQmCC
+        wwAADsMBx2+oZAAAAFFJREFUOE/NkEsKACAIRD2b9z+PW9vF5AcyQRLewhl8RKSq1MEFVc4FRkTUgv2V
+        gJk3MwL7ZCtAUgEeZXwuaP0BTiTAfkZgwT4UvOCCKi6osgAjRH5TBg3ckAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb
index b426277..5d68441 100644
--- a/Global_Indexer/frmStart.vb
+++ b/Global_Indexer/frmStart.vb
@@ -157,6 +157,17 @@ Public Class frmStart
         Catch ex As Exception
             LOGGER.Error(ex)
         End Try
+
+        If Not IsNothing(WINDREAM) AndAlso WINDREAM.SessionLoggedin = True Then
+            LOGGER.Debug("Closing frmStart - Now logging out of windream session...")
+            Try
+                WINDREAM.Session.Logout()
+                LOGGER.Debug("windream session logged out successfully.")
+            Catch ex As Exception
+                LOGGER.Warn("Error while logging out windream session: " & ex.Message)
+                LOGGER.Error(ex)
+            End Try
+        End If
     End Sub
 #End Region