diff --git a/BeWo/app.config b/BeWo/app.config
index da18d8e34..f93c69af8 100644
--- a/BeWo/app.config
+++ b/BeWo/app.config
@@ -8,12 +8,12 @@
       <basicHttpBinding>
         <binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
-          <security mode="None"/>
+          <security mode="Transport"/>
           <!-- mode="Transport" für echten Server und "None" sonst-->
         </binding>
         <binding name="BeWoStreamingEndpoint" receiveTimeout="10:10:00" sendTimeout="10:01:00" maxBufferSize="65536" maxReceivedMessageSize="67108864" transferMode="StreamedRequest" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
-          <security mode="None"/>
+          <security mode="Transport"/>
           <!-- mode="Transport" für echten Server -->
         </binding>
         <binding name="QueryServiceEndpoint" closeTimeout="00:10:00" openTimeout="00:10:00" receiveTimeout="00:10:00" sendTimeout="00:10:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
diff --git a/BeWoLauncher/App.config b/BeWoLauncher/App.config
index ddbd19381..7a23e99d7 100644
--- a/BeWoLauncher/App.config
+++ b/BeWoLauncher/App.config
@@ -16,11 +16,16 @@
           <security mode="None" />
           <!-- mode="Transport" für echten Server und "None" sonst-->
         </binding>
+        <binding name="BeWoBasicEndpointTransport" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
+          <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+          <security mode="Transport" />
+          <!-- mode="Transport" für echten Server und "None" sonst-->
+        </binding>
       </basicHttpBinding>
     </bindings>
     <client>
-      <endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.ILauncherService" name="LauncherServiceEndpoint" />
-      <endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.IEnumTranslationService" name="EnumTranslationEndpoint" />
+      <endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpointTransport" contract="BeWoLauncher.ServiceProxy.ILauncherService" name="LauncherServiceEndpoint" />
+      <endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpointTransport" contract="BeWoLauncher.ServiceProxy.IEnumTranslationService" name="EnumTranslationEndpoint" />
       <endpoint binding="basicHttpBinding" bindingConfiguration="BeWoBasicEndpoint" contract="BeWoLauncher.ServiceProxy.IDownloadBeWoService" name="DownloadBeWoEndpoint" />
     </client>
     <behaviors>
diff --git a/BeWoLauncher/Logic/Controller/ProcessController.cs b/BeWoLauncher/Logic/Controller/ProcessController.cs
index 9fed8fdd4..b9ec15a28 100644
--- a/BeWoLauncher/Logic/Controller/ProcessController.cs
+++ b/BeWoLauncher/Logic/Controller/ProcessController.cs
@@ -58,7 +58,7 @@ namespace BeWoLauncher.Logic.Controller
             //ConnectionInformation.DownloadServerAddress = ConnectionInformation.DownloadServerAddressExact.ToString();
             //ConnectionInformation.CoreServerAddress = ConnectionInformation.CoreServerAddress.ToString();
 
-            LauncherServiceFacade.UpdateServerAddresses(SessionInformation.Connection.DownloadServerAddressExact, SessionInformation.Connection.CoreServerAddressExact);
+            LauncherServiceFacade.UpdateServerAddresses();
         }
         
         internal static void StartLauncherShutdown()
diff --git a/BeWoLauncher/Logic/ServiceProxy/LauncherServiceFacade.cs b/BeWoLauncher/Logic/ServiceProxy/LauncherServiceFacade.cs
index 12ad742b8..c8dbe9637 100644
--- a/BeWoLauncher/Logic/ServiceProxy/LauncherServiceFacade.cs
+++ b/BeWoLauncher/Logic/ServiceProxy/LauncherServiceFacade.cs
@@ -1,5 +1,6 @@
 using BeWoLauncher.Multitenancy;
 using BeWoLauncher.Security;
+using BS.SharedLauncher.Information;
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
@@ -17,20 +18,21 @@ namespace BeWoLauncher.ServiceProxy
 
         private static readonly int _RunningAsyncs;
 
-        public static void UpdateServerAddresses(string launcher, string main)
+        public static void UpdateServerAddresses()
         {
-            var serverName = launcher;
-            var serverName2 = main;
-            if (serverName.Substring(serverName.Length - 1, 1) != "/")
-                serverName += "/";
-            if (serverName2.Substring(serverName2.Length - 1, 1) != "/")
-                serverName2 += "/";
+            var download = SessionInformation.Connection.DownloadServerAddressExact;
+            var core = SessionInformation.Connection.CoreServerAddressExact;
+
+            if (download.Substring(download.Length - 1, 1) != "/")
+                download += "/";
+            if (core.Substring(core.Length - 1, 1) != "/")
+                core += "/";
 
             _EndpointAddresses = new Dictionary<Type, EndpointAddress>
             {
-                { typeof(ILauncherService), new EndpointAddress(serverName2 + "LauncherService.svc") },
-                { typeof(IEnumTranslationService), new EndpointAddress(serverName2 + "EnumTranslationService.svc") },
-                { typeof(IDownloadBeWoService), new EndpointAddress(serverName + "DownloadBeWoService.svc") }
+                { typeof(ILauncherService), new EndpointAddress(core + "LauncherService.svc") },
+                { typeof(IEnumTranslationService), new EndpointAddress(core + "EnumTranslationService.svc") },
+                { typeof(IDownloadBeWoService), new EndpointAddress(download + "DownloadBeWoService.svc") }
             };
         }
 
diff --git a/BeWoLauncher/View/LoginView.xaml.cs b/BeWoLauncher/View/LoginView.xaml.cs
index cf5fe7352..293cf130c 100644
--- a/BeWoLauncher/View/LoginView.xaml.cs
+++ b/BeWoLauncher/View/LoginView.xaml.cs
@@ -171,6 +171,7 @@ namespace BeWoLauncher.View
                 SessionInformation.Login.Password = PasswordBox_Password.Password;
                 SessionInformation.Login.Pin = PINTextBox.Text;
 
+                LauncherServiceFacade.UpdateServerAddresses();
 
                 if (!String.IsNullOrEmpty(SessionInformation.Login.Pin))
                 {
diff --git a/DownloadServer/Web.config b/DownloadServer/Web.config
index c49cca32b..3b3110623 100644
--- a/DownloadServer/Web.config
+++ b/DownloadServer/Web.config
@@ -59,7 +59,7 @@
         </binding>
         <binding name="BeWoBasicEndpoint" closeTimeout="00:05:00" openTimeout="00:05:00" receiveTimeout="00:10:00" sendTimeout="00:05:00" allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="2147483647" maxReceivedMessageSize="2147483647" textEncoding="utf-8" transferMode="Buffered" useDefaultWebProxy="true" messageEncoding="Text">
           <readerQuotas maxDepth="32" maxStringContentLength="2147483647" maxArrayLength="2147483647" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-          <security mode="None" />
+          <security mode="Transport" />
           <!-- mode="Transport" für echten Server und "None" sonst-->
         </binding>
       </basicHttpBinding>
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index d4f1ce7a0..c928057a2 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -31,7 +31,7 @@
           </StartCmdLineArguments>
           <StartWorkingDirectory>
           </StartWorkingDirectory>
-          <EnableENC>True</EnableENC>
+          <EnableENC>False</EnableENC>
           <AlwaysStartWebServerOnDebug>True</AlwaysStartWebServerOnDebug>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
index 25e41b202..19a9f8bc3 100644
--- a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
+++ b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
@@ -34,8 +34,7 @@ namespace BeWo.Service.ServiceImplementations
         {
             return null;
         }
-
-
+        
         public UpdatePlanResponse GetUpdatePlan(UpdatePlanRequest request)
         {
             try
diff --git a/SharedLauncher/Information/SessionInformation.cs b/SharedLauncher/Information/SessionInformation.cs
index ee4f38250..5a96a418f 100644
--- a/SharedLauncher/Information/SessionInformation.cs
+++ b/SharedLauncher/Information/SessionInformation.cs
@@ -26,9 +26,9 @@ namespace BS.SharedLauncher.Information
             {
                 // Core Server
 
-                return "http://localhost:3777/Host/";
+                //return "http://localhost:3777/Host/";
                 //return "https://localhost:44308/Host/";
-                //return "https://app5.bewoplaner.de";
+                return "https://app5.bewoplaner.de";
             }
             throw new Exception();
         }