diff --git a/.hgignore b/.hgignore
index 7a83c128..7c015892 100644
--- a/.hgignore
+++ b/.hgignore
@@ -30,3 +30,4 @@ WebsitePanel/Sources/UpgradeLog.XML
 WebsitePanel/Sources/UpgradeLog.htm
 WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Information.png
 WebsitePanel/Sources/_UpgradeReport_Files/UpgradeReport_Success.png
+WebsitePanel/Sources/packages
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
index 81a54ce1..fd84fa8e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/FileSystemController.cs
@@ -19,6 +19,7 @@ using System.Net;
 namespace WebsitePanel.WebDavPortal.Controllers
 
 {
+    [ValidateInput(false)]
     [LdapAuthorization]
     public class FileSystemController : Controller
     {
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml
index 75e22523..c7c827b8 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/Account/Login.cshtml
@@ -16,9 +16,9 @@
             </div>
         }
         <div class="form-group">
-            <label for="inputEmail" class="col-sm-2 control-label">Login</label>
+            <label for="inputLogin" class="col-sm-2 control-label">Login</label>
             <div class="col-sm-10">
-                @Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputPassword", placeholder = "Login" })
+                @Html.TextBoxFor(x => x.Login, new { @class = "form-control", id = "inputLogin", placeholder = "Login", autofocus = "autofocus" })
             </div>
         </div>
         <div class="form-group">
@@ -34,3 +34,13 @@
         </div>
     </form>
 </div>
+
+
+@section scripts
+{
+    <script>
+        $(document).ready(function () {
+            $('[autofocus]').focus();
+        });
+    </script>
+}
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
index 0d7d6f9f..019e829e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/ShowContent.cshtml
@@ -1,9 +1,11 @@
 @using WebsitePanel.WebDav.Core.Client
 @using Ninject
+@using WebsitePanel.WebDavPortal.Config
+
 @model WebsitePanel.WebDavPortal.Models.ModelForWebDav
 @{
     var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
-    ViewBag.Title = (string.IsNullOrEmpty(Model.UrlSuffix) ? webDavManager.OrganizationName : Model.UrlSuffix);
+    ViewBag.Title = WebDavAppConfigManager.Instance.ApplicationName;
 }
 @Scripts.Render("~/bundles/jquery")
 @Scripts.Render("~/bundles/appScripts")
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
index 1bd9cf33..b0009e5c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Views/FileSystem/_ResoursePartial.cshtml
@@ -6,7 +6,7 @@
   
 @{
     string actualPath = Model.ItemType == ItemType.Folder ? "~/Content/Images/folder_100x100.png" : WebDavAppConfigManager.Instance.FileIcons[Path.GetExtension(Model.DisplayName.Trim('/'))];
-    string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Path.GetFileNameWithoutExtension(Model.DisplayName);
+    string name = Model.ItemType == ItemType.Folder ? Model.DisplayName.Trim('/') : Model.DisplayName;
     var opener = new FileOpenerManager()[Path.GetExtension(Model.DisplayName)];
     bool isTargetBlank;
     string href = "/";
@@ -18,7 +18,6 @@
             break;
         default:
             isTargetBlank = false;
-            var webDavManager = DependencyResolver.Current.GetService<WebsitePanel.WebDavPortal.Models.IWebDavManager>();
             href = Model.Href.AbsolutePath; 
             break;
     }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
index 3acfef9f..a15db69c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
+++ b/WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
@@ -23,47 +23,47 @@
   </log4net>
 
   <appSettings>
-    <add key="webpages:Version" value="3.0.0.0"/>
-    <add key="webpages:Enabled" value="false"/>
-    <add key="ClientValidationEnabled" value="true"/>
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+    <add key="webpages:Version" value="3.0.0.0" />
+    <add key="webpages:Enabled" value="false" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <add key="WebPortal.ThemeProvider" value="WebsitePanel.Portal.WebPortalThemeProvider, WebsitePanel.Portal.Modules" />
     <add key="WebPortal.PageTitleProvider" value="WebsitePanel.Portal.WebPortalPageTitleProvider, WebsitePanel.Portal.Modules" />
     <add key="ChartImageHandler" value="storage=file;timeout=20;" />
     <add key="SessionValidationKey" value="DAD46D476F85E0198BCA134D7AA5CC1D7" />
     
     <add key="WebsitePanel.CryptoKey" value="jj2n22t2kje035cg4l77" />
-    <add key="WebsitePanel.EncryptionEnabled" value="true"/>
-    <add key="WebsitePanel.AltCryptoKey" value="CryptoKey"/>
+    <add key="WebsitePanel.EncryptionEnabled" value="true" />
+    <add key="WebsitePanel.AltCryptoKey" value="CryptoKey" />
   </appSettings>
   <webDavExplorerConfigurationSettings>
     <!--<userDomain value=""/>-->
-    <applicationName value="WebDAV Explorer"/>
-    <elementsRendering defaultCount="20" addElementsCount="20" elementsToIgnoreKey="web.config"/>
+    <applicationName value="WebDAV Explorer" />
+    <elementsRendering defaultCount="20" addElementsCount="20" elementsToIgnoreKey="web.config" />
     <websitePanelConstantUser login="serveradmin" password="HtR7J8dtBhovYLigXNtVutxqpvaE48Z+FBIokWZlR/g=" />
     <sessionKeys>
-      <add key="AccountInfoSessionKey" value="AccountInfo"/>
-      <add key="WebDavManagerSessionKey" value="WebDavManager"/>
-      <add key="ResourseRenderCountSessionKey" value="ResourseRenderCount"/>
-      <add key="ItemIdSessionKey" value="ItemId"/>
+      <add key="AccountInfoSessionKey" value="AccountInfo" />
+      <add key="WebDavManagerSessionKey" value="WebDavManager" />
+      <add key="ResourseRenderCountSessionKey" value="ResourseRenderCount" />
+      <add key="ItemIdSessionKey" value="ItemId" />
     </sessionKeys>
     <fileIcons defaultPath="~/Content/Images/other-icon.png">
-      <add extension=".txt" path="~/Content/Images/txt-icon.png"/>
-      <add extension=".doc" path="~/Content/Images/word-icon.png"/>
-      <add extension=".docx" path="~/Content/Images/word-icon.png"/>
-      <add extension=".jpg" path="~/Content/Images/jpg-icon.png"/>
-      <add extension=".jpeg" path="~/Content/Images/jpg-icon.png"/>
-      <add extension=".xls" path="~/Content/Images/excel-icon.png"/>
-      <add extension=".xlsx" path="~/Content/Images/excel-icon.png"/>
-      <add extension=".png" path="~/Content/Images/png-icon.png"/>
+      <add extension=".txt" path="~/Content/Images/txt-icon.png" />
+      <add extension=".doc" path="~/Content/Images/word-icon.png" />
+      <add extension=".docx" path="~/Content/Images/word-icon.png" />
+      <add extension=".jpg" path="~/Content/Images/jpg-icon.png" />
+      <add extension=".jpeg" path="~/Content/Images/jpg-icon.png" />
+      <add extension=".xls" path="~/Content/Images/excel-icon.png" />
+      <add extension=".xlsx" path="~/Content/Images/excel-icon.png" />
+      <add extension=".png" path="~/Content/Images/png-icon.png" />
     </fileIcons>
     <officeOnline isEnabled="True" url="https://vir-owa.virtuworks.net/op/view.aspx">
-      <add extension=".doc"/>
-      <add extension=".docx"/>
-      <add extension=".xls"/>
-      <add extension=".xlsx"/>
-      <add extension=".ppt"/>
-      <add extension=".pptx"/>
+      <add extension=".doc" />
+      <add extension=".docx" />
+      <add extension=".xls" />
+      <add extension=".xlsx" />
+      <add extension=".ppt" />
+      <add extension=".pptx" />
     </officeOnline>
   </webDavExplorerConfigurationSettings>
   <!--
@@ -75,20 +75,10 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5"/>
-    <siteMap defaultProvider="WebsitePanelSiteMapProvider" enabled="true">
-      <providers>
-        <add name="WebsitePanelSiteMapProvider" type="WebsitePanel.WebPortal.WebsitePanelSiteMapProvider, WebsitePanel.WebPortal" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
-    <!-- Set default scheme -->
-    <pages theme="Default" validateRequest="false" controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
-      <controls>
-        <add tagPrefix="ajaxToolkit" namespace="AjaxControlToolkit" assembly="AjaxControlToolkit" />
-      </controls>
-    </pages>
+    <compilation debug="true" targetFramework="4.5" />
     <!-- Maximum size of uploaded file, in MB -->
-    <httpRuntime executionTimeout="1800" requestValidationMode="2.0" maxRequestLength="16384" enableVersionHeader="false" />
+    <httpRuntime executionTimeout="1800" requestValidationMode="2.0" requestPathInvalidCharacters="" maxRequestLength="16384" enableVersionHeader="false" />
+    <pages validateRequest="false" />
     <!--
           ASMX is mapped to a new handler so that proxy javascripts can also be served.
     -->
@@ -108,7 +98,7 @@
     <handlers>
       <remove name="UrlRoutingModule-4.0" />
       <add name="ChartImg" path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" resourceType="Unspecified" preCondition="integratedMode" />
-      <add name="FileHandler" path="*.*" verb="GET" type="WebsitePanel.WebDavPortal.HttpHandlers.FileTransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <add name="FileHandler" path="*.*" verb="GET" type="WebsitePanel.WebDavPortal.HttpHandlers.FileTransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
     <modules>
       <add name="SecureSession" type="WebsitePanel.WebPortal.SecureSessionModule" />
@@ -117,32 +107,32 @@
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>