diff --git a/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java b/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java
index c2b117c..4aa955d 100644
--- a/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java
+++ b/security-jboss-sx/jbosssx/src/main/java/org/picketbox/plugins/vault/PicketBoxSecurityVault.java
@@ -131,7 +131,10 @@ public class PicketBoxSecurityVault implements SecurityVault
       String keystoreURL = (String) options.get(KEYSTORE_URL);
       if(keystoreURL == null)
          throw new SecurityVaultException(PicketBoxMessages.MESSAGES.invalidNullOrEmptyOptionMessage(KEYSTORE_URL));
-      keystoreURL = StringUtil.getSystemPropertyAsString(keystoreURL.replaceAll(":", StringUtil.PROPERTY_DEFAULT_SEPARATOR));  // replace single ":" with PL default
+      if (keystoreURL.contains("${")){
+          keystoreURL = keystoreURL.replaceAll(":", StringUtil.PROPERTY_DEFAULT_SEPARATOR);  // replace single ":" with PL default
+      }
+      keystoreURL = StringUtil.getSystemPropertyAsString(keystoreURL);
       
       String maskedPassword = (String) options.get(KEYSTORE_PASSWORD);
       if(maskedPassword == null)
@@ -167,9 +170,12 @@ public class PicketBoxSecurityVault implements SecurityVault
       ObjectInputStream mapIS = null;
       try
       {
-         decodedEncFileDir = StringUtil.getSystemPropertyAsString(encFileDir.replaceAll(":", 
-       		  StringUtil.PROPERTY_DEFAULT_SEPARATOR));  // replace single ":" with PL default 
-         if(directoryExists(decodedEncFileDir) == false)
+         if (encFileDir.contains("${)")){
+             encFileDir = encFileDir.replaceAll(":",StringUtil.PROPERTY_DEFAULT_SEPARATOR);
+         }
+         decodedEncFileDir = StringUtil.getSystemPropertyAsString(encFileDir);  // replace single ":" with PL default
+
+          if(directoryExists(decodedEncFileDir) == false)
             throw new SecurityVaultException(PicketBoxMessages.MESSAGES.fileOrDirectoryDoesNotExistMessage(decodedEncFileDir));
          
          if(!(decodedEncFileDir.endsWith("/") || decodedEncFileDir.endsWith("\\")))