diff --git a/WebContent/WEB-INF/applicationContext.xml b/WebContent/WEB-INF/applicationContext.xml
index 0e94f408f9..c51933e551 100644
--- a/WebContent/WEB-INF/applicationContext.xml
+++ b/WebContent/WEB-INF/applicationContext.xml
@@ -224,9 +224,13 @@
   </bean>
   <!-- -->
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+    <property name="locations" value="classpath:env.properties"/>
+  </bean>
+
   <bean id="databaseSource" class="org.springframework.jndi.JndiObjectFactoryBean">
     <property name="expectedType" value="javax.sql.DataSource"/>
-    <property name="jndiName" value="java:comp/env/jdbc/scadalts"/>
+    <property name="jndiName" value="${db.datasourceName}"/>
   </bean>
 
   <bean id="mangoContextListener" class="com.serotonin.mango.MangoContextListener" />
diff --git a/src/com/serotonin/mango/db/BasePooledAccess.java b/src/com/serotonin/mango/db/BasePooledAccess.java
index 97cf86c680..13a56d73fb 100644
--- a/src/com/serotonin/mango/db/BasePooledAccess.java
+++ b/src/com/serotonin/mango/db/BasePooledAccess.java
@@ -23,8 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.servlet.ServletContext;
 import javax.sql.DataSource;
 
@@ -35,6 +33,8 @@
 import com.serotonin.ShouldNeverHappenException;
 import com.serotonin.db.spring.ExtendedJdbcTemplate;
 import com.serotonin.mango.Common;
+import org.scada_lts.web.beans.ApplicationBeans;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 
 /**
  * @author Matthew Lohbihler
@@ -56,23 +56,23 @@ protected void initializeImpl(String propertyPrefix, String dataSourceName)
     {
         log.info("Initializing pooled connection manager");
 
-        if(Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasource", "false").equals("true"))
-        {
-            try
-            {
-                log.info("Looking for Datasource: " + Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasourceName"));
-                dataSource = (DataSource) new InitialContext().lookup(Common.getEnvironmentProfile().getString(propertyPrefix + "db.datasourceName"));
-                try (Connection conn = dataSource.getConnection()) {
-                    log.info("DataSource meta: " + conn.getMetaData().getDatabaseProductName() + " " + conn.getMetaData().getDatabaseProductVersion());
-                    dataSourceFound = true;
+        boolean datasource = Common.getEnvironmentProfile().getBoolean(propertyPrefix + "db.datasource", false);
+
+        if(datasource) {
+            try {
+                log.info("Looking for Datasource: " + dataSourceName);
+                dataSource = ApplicationBeans.getBean("databaseSource", DataSource.class);
+                if(dataSource == null) {
+                    log.info("Datasource not found! dataSourceName: " + dataSourceName);
+                } else {
+                    try (Connection conn = dataSource.getConnection()) {
+                        log.info("DataSource meta: " + conn.getMetaData().getDatabaseProductName() + " " + conn.getMetaData().getDatabaseProductVersion());
+                        dataSourceFound = true;
+                    }
                 }
-            }
-            catch(NamingException e)
-            {
+            } catch(IllegalArgumentException | NoSuchBeanDefinitionException e) {
                 log.info("Datasource not found!" + e.getLocalizedMessage());
-            }
-            catch(SQLException e)
-            {
+            } catch(SQLException e) {
                 log.error("SQL Exception: " + e.getLocalizedMessage());
             }
         }
diff --git a/src/org/scada_lts/permissions/service/util/PermissionsUtils.java b/src/org/scada_lts/permissions/service/util/PermissionsUtils.java
index 74f8674790..3adece697f 100644
--- a/src/org/scada_lts/permissions/service/util/PermissionsUtils.java
+++ b/src/org/scada_lts/permissions/service/util/PermissionsUtils.java
@@ -84,16 +84,16 @@ public static <T> Set<T> reduce(Set<T> accesses, ToIntFunction<T> getAccess, ToI
     }
 
     private static <T, U> void updatePermissions(U user, List<T> accessesFromUser,
-                                                    PermissionsService<T, U> service,
+                                                 PermissionsService<T, U> service,
                                                  Comparator<T> comparator) {
         List<T> accessesFromDatabase = service.getPermissions(user);
         if(!sortEquals(accessesFromUser, accessesFromDatabase, comparator)) {
-            if(!accessesFromDatabase.isEmpty() && !accessesFromUser.containsAll(accessesFromDatabase)) {
+            if(!accessesFromDatabase.isEmpty() && !containsAll(accessesFromUser, accessesFromDatabase)) {
                 List<T> notExistInUser = diff(accessesFromUser, accessesFromDatabase);
                 service.removePermissions(user, notExistInUser);
                 accessesFromDatabase.removeAll(notExistInUser);
             }
-            if((accessesFromDatabase.isEmpty() || !accessesFromDatabase.containsAll(accessesFromUser))
+            if((accessesFromDatabase.isEmpty() || !containsAll(accessesFromDatabase, accessesFromUser))
                     && !accessesFromUser.isEmpty()) {
                 List<T> noExistInDatabase = diff(accessesFromDatabase, accessesFromUser);
                 service.addOrUpdatePermissions(user, noExistInDatabase);
@@ -101,6 +101,10 @@ private static <T, U> void updatePermissions(U user, List<T> accessesFromUser,
         }
     }
 
+    private static <T> boolean containsAll(List<T> accesses1, List<T> accesses2) {
+        return new HashSet<>(accesses1).containsAll(accesses2);
+    }
+
     private static <T, U> void update(U user,
                                       List<T> permissionsFromUser,
                                       PermissionsService<T, U> service,
diff --git a/src/org/scada_lts/utils/PathSecureUtils.java b/src/org/scada_lts/utils/PathSecureUtils.java
index 8856c4a0d8..10e653a200 100644
--- a/src/org/scada_lts/utils/PathSecureUtils.java
+++ b/src/org/scada_lts/utils/PathSecureUtils.java
@@ -32,17 +32,17 @@ public static Optional<File> toSecurePath(Path path, BinaryOperator<Path> reduce
         return normalizePath(path, reduce).map(Path::toFile);
     }
 
-    public static Path getAppContextSystemFilePath(Path folder) {
+    public static Path getAppContextSystemFilePath(String folder) {
         if(folder == null)
             throw new NullPointerException();
-        String realPath = Common.ctx.getServletContext().getRealPath(normalizeSeparator(folder.toString()));
+        String realPath = Common.ctx.getServletContext().getRealPath(normalizeSeparator(decodePath(folder)));
         if(realPath == null)
             return Paths.get("");
         return Paths.get(realPath);
     }
 
     public static Path getAppContextSystemFilePath() {
-        return getAppContextSystemFilePath(Paths.get(File.separator));
+        return getAppContextSystemFilePath(File.separator);
     }
 
     public static String getPartialPath(File file) {
diff --git a/src/org/scada_lts/utils/StaticImagesUtils.java b/src/org/scada_lts/utils/StaticImagesUtils.java
index a366408ef0..5930057830 100644
--- a/src/org/scada_lts/utils/StaticImagesUtils.java
+++ b/src/org/scada_lts/utils/StaticImagesUtils.java
@@ -75,7 +75,7 @@ private static File getSystemFileByRequest(HttpServletRequest request) {
             path = getUploadsSystemFilePath(Paths.get(url));
         }
         if(StringUtils.isEmpty(path.toString()))
-            path = PathSecureUtils.getAppContextSystemFilePath(Paths.get(url));
+            path = PathSecureUtils.getAppContextSystemFilePath(url);
         return path.toFile();
     }
 
diff --git a/src/org/scada_lts/utils/UploadFileUtils.java b/src/org/scada_lts/utils/UploadFileUtils.java
index 53d1b6dbb8..3793dee850 100644
--- a/src/org/scada_lts/utils/UploadFileUtils.java
+++ b/src/org/scada_lts/utils/UploadFileUtils.java
@@ -319,7 +319,7 @@ private static List<Path> getImageSystemFilePaths(Supplier<String> getLocalPath,
             createIfNotExists(path);
             paths.add(path);
         }
-        Path path = getAppContextSystemFilePath(Paths.get(normalizeFolder));
+        Path path = getAppContextSystemFilePath(normalizeFolder);
         createIfNotExists(path);
         paths.add(path);
         return paths;
@@ -333,7 +333,7 @@ private static Path getImageSystemFileToWritePath(Supplier<String> getLocalPath,
                 || normalizedPath.endsWith(normalizedFolder + File.separator))) {
             path = getAbsoluteResourcePath(normalizedPath);
         } else {
-            path = getAppContextSystemFilePath(Paths.get(normalizedFolder));
+            path = getAppContextSystemFilePath(normalizedFolder);
         }
         createIfNotExists(path);
         return path;