diff --git a/dsl/src/main/java/org/cloudifysource/dsl/internal/tools/download/ResourceDownloader.java b/dsl/src/main/java/org/cloudifysource/dsl/internal/tools/download/ResourceDownloader.java
index a4584eb982..2d07b2f450 100644
--- a/dsl/src/main/java/org/cloudifysource/dsl/internal/tools/download/ResourceDownloader.java
+++ b/dsl/src/main/java/org/cloudifysource/dsl/internal/tools/download/ResourceDownloader.java
@@ -362,7 +362,12 @@ private InputStream openConnectionInputStream(final URL url) throws ResourceDown
 				throw new ResourceDownloadException("Invalid resource URL: " + url.toString());
 			}
 			final URLConnection connection = url.openConnection();
-			if (this.userName != null || this.password != null) {
+			if(url.getUserInfo() != null) {
+                
+                String basicAuth = "Basic " + new String(new Base64().encode(url.getUserInfo().getBytes()));
+                connection.setRequestProperty("Authorization", basicAuth);
+                
+            }else if (this.userName != null || this.password != null) {
 				logger.fine("Setting connection credentials");
 				String up = this.userName + ":" + this.password;
 				String encoding = new String(