diff --git a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
index b6af92f..46fc2fa 100644
--- a/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
+++ b/spring-integration-smb/src/main/java/org/springframework/integration/smb/session/SmbConfig.java
@@ -16,8 +16,8 @@
 
 package org.springframework.integration.smb.session;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
+import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -30,6 +30,8 @@ import org.springframework.util.StringUtils;
  *
  * @author Markus Spann
  * @author Prafull Kumar Soni
+ * @author Artem Bilan
+ *
  * @since 1.0
  */
 public class SmbConfig {
@@ -134,15 +136,14 @@ public class SmbConfig {
 
 	String getDomainUserPass(boolean _includePassword) {
 		String domainUserPass;
-		String user = _includePassword ? this.username : "********";
 		if (StringUtils.hasText(this.domain)) {
-			domainUserPass = String.format("%s;%s", this.domain, user);
+			domainUserPass = String.format("%s;%s", this.domain, this.username);
 		}
 		else {
-			domainUserPass = user;
+			domainUserPass = this.username;
 		}
 		if (StringUtils.hasText(this.password)) {
-			domainUserPass += ":" + this.password;
+			domainUserPass += ":" + (_includePassword ? this.password : "********");
 		}
 		return domainUserPass;
 	}
@@ -168,15 +169,21 @@ public class SmbConfig {
 
 	public final String getUrl(boolean _includePassword) {
 		String domainUserPass = getDomainUserPass(_includePassword);
-		if (domainUserPass != null) {
-			try {
-				domainUserPass = URLEncoder.encode(domainUserPass, "UTF8");
-			}
-			catch (UnsupportedEncodingException ex) {
-				throw new IllegalStateException(ex);
-			}
+
+		String path = StringUtils.cleanPath(this.shareAndDir);
+
+		if (!path.startsWith("/")) {
+			path = "/" + path;
 		}
-		return String.format("smb://%s@%s/%s", domainUserPass, getHostPort(), StringUtils.cleanPath(this.shareAndDir));
+
+		try {
+			return new URI("smb", domainUserPass, this.host, this.port, path, null, null)
+					.toASCIIString();
+		}
+		catch (URISyntaxException e) {
+			throw new IllegalArgumentException(e);
+		}
+
 	}
 
 	@Override
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
index fd6782e..d6a9760 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests-context.xml
@@ -3,10 +3,8 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:int-smb="http://www.springframework.org/schema/integration/smb"
-	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration  http://www.springframework.org/schema/integration/spring-integration.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
 		http://www.springframework.org/schema/integration/smb http://www.springframework.org/schema/integration/smb/spring-integration-smb.xsd">
 
 	<int:message-history/>
@@ -15,8 +13,8 @@
 		<property name="host"        value="localhost"/>
 		<property name="port"        value="0"/>
 		<property name="domain"      value=""/>
-		<property name="username"    value="sambaguest"/>
-		<property name="password"    value="sambaguest"/>
+		<property name="username"    value="sambagu@est"/>
+		<property name="password"    value="sambag%uest"/>
 		<property name="shareAndDir" value="smb-share/"/>
 		<property name="replaceFile" value="true"/>
 	</bean>
diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
index eb0b635..e225a0e 100644
--- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
+++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/SmbMessageHistoryTests.java
@@ -18,22 +18,38 @@ package org.springframework.integration.smb;
 
 import static org.junit.Assert.assertEquals;
 
+import java.net.URI;
+import java.net.URISyntaxException;
+
 import org.junit.Test;
 
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
+import org.springframework.integration.smb.session.SmbSessionFactory;
 
 /**
  * @author Markus Spann
  * @author Prafull Kumar Soni
+ * @author Artem Bilan
  *
  */
 public class SmbMessageHistoryTests extends AbstractBaseTests {
 
 	@Test
-	public void testMessageHistory() {
-		SourcePollingChannelAdapter adapter = getApplicationContext()
+	public void testMessageHistory() throws URISyntaxException {
+		ClassPathXmlApplicationContext applicationContext = getApplicationContext();
+		SourcePollingChannelAdapter adapter = applicationContext
 				.getBean("smbInboundChannelAdapter", SourcePollingChannelAdapter.class);
 		assertEquals("smbInboundChannelAdapter", adapter.getComponentName());
 		assertEquals("smb:inbound-channel-adapter", adapter.getComponentType());
+
+		SmbSessionFactory smbSessionFactory = applicationContext.getBean(SmbSessionFactory.class);
+
+		String url = smbSessionFactory.getUrl();
+		URI uri = new URI(url);
+		assertEquals("sambagu%40est:sambag%25uest", uri.getRawUserInfo());
+		assertEquals("sambagu@est:sambag%uest", uri.getUserInfo());
+
+		applicationContext.close();
 	}
 }