diff --git a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java
index 9025114ec6..c28af296cb 100644
--- a/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java
+++ b/modules/commons/src/main/java/org/apache/synapse/commons/vfs/VFSUtils.java
@@ -67,7 +67,7 @@ public class VFSUtils {
     /**
      * URL pattern
      */
-    private static final Pattern URL_PATTERN = Pattern.compile("[a-z]+://.*");
+    private static final Pattern URL_PATTERN = Pattern.compile("[a-zA-Z0-9]+://.*");
 
     /**
      * Password pattern
@@ -350,7 +350,7 @@ public static String maskURLPassword(String url) {
         String maskUrl;
         if (urlMatcher.find()) {
             final Matcher pwdMatcher = PASSWORD_PATTERN.matcher(url);
-            maskUrl = pwdMatcher.replaceFirst("\":***@\"");
+            maskUrl = pwdMatcher.replaceFirst(":***@");
             return maskUrl;
         }
         return url;