diff --git a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
index ba3ef6db11e1fd52c020f6b4313ee97ceeb6249c..8b186275adf376c19407ed5210c114f4b30bd997 100644
--- a/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
+++ b/src/main/java/no/bioforsk/vips/coremanager/session/UserController.java
@@ -41,7 +41,7 @@ public class UserController {
     {
         Query q = em.createNamedQuery("VIPSCoreCredentials.findByUsernameAndPassword", VIPSCoreCredentials.class);
         q.setParameter("username", loginInfo.get("username"));
-        String salt = this.getVIPSCoreServerProperties().getProperty("MD5_SALT");
+        String salt = System.getProperty("no.bioforsk.vips.core.MD5_SALT");
         q.setParameter("password", MD5Encrypter.getMD5HexString(loginInfo.get("password"),salt));
         try
         {