diff --git a/nunaliit2-couch-user/pom.xml b/nunaliit2-couch-user/pom.xml
index 6fa3d3fce..ca7067845 100644
--- a/nunaliit2-couch-user/pom.xml
+++ b/nunaliit2-couch-user/pom.xml
@@ -53,5 +53,10 @@
     	<type>jar</type>
     	<scope>test</scope>
     </dependency>
+    <dependency>
+    	<groupId>org.apache.httpcomponents</groupId>
+    	<artifactId>httpclient</artifactId>
+    	<version>${apache-httpclient.version}</version>
+    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/nunaliit2-couch-user/src/main/java/ca/carleton/gcrc/couch/user/mail/UserMailNotificationImpl.java b/nunaliit2-couch-user/src/main/java/ca/carleton/gcrc/couch/user/mail/UserMailNotificationImpl.java
index 4441a64bb..8bc18694b 100644
--- a/nunaliit2-couch-user/src/main/java/ca/carleton/gcrc/couch/user/mail/UserMailNotificationImpl.java
+++ b/nunaliit2-couch-user/src/main/java/ca/carleton/gcrc/couch/user/mail/UserMailNotificationImpl.java
@@ -1,6 +1,5 @@
 package ca.carleton.gcrc.couch.user.mail;
 
-import java.net.URLEncoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -10,6 +9,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.apache.http.client.utils.URIBuilder;
+
 import ca.carleton.gcrc.mail.MailDelivery;
 import ca.carleton.gcrc.mail.MailMessage;
 import ca.carleton.gcrc.mail.MailRecipient;
@@ -143,8 +144,9 @@ public void sendUserCreationNotice(String emailAddress, String token) throws Exc
 		Map<String,String> parameters = new HashMap<String,String>();
 		{
 			// Compute link
-			String urlEncodedToken = URLEncoder.encode(token, "UTF-8");
-			String link = createUserUrl + "?token=" + urlEncodedToken;
+			URIBuilder builder = new URIBuilder(createUserUrl);
+			builder.addParameter("token", token);
+			String link = builder.build().toString();
 			parameters.put("link", link);
 		}
 		
@@ -225,8 +227,9 @@ public void sendPasswordRecoveryNotice(String emailAddress, String token) throws
 		Map<String,String> parameters = new HashMap<String,String>();
 		{
 			// Compute link
-			String urlEncodedToken = URLEncoder.encode(token, "UTF-8");
-			String link = passwordRecoveryUrl + "?token=" + urlEncodedToken;
+			URIBuilder builder = new URIBuilder(passwordRecoveryUrl);
+			builder.addParameter("token", token);
+			String link = builder.build().toString();
 			parameters.put("link", link);
 		}
 		
diff --git a/pom.xml b/pom.xml
index d8964af2c..1fa196af6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,7 @@
 		<slf4j.version>1.7.13</slf4j.version>
 		<jsoup.version>1.12.1</jsoup.version>
 		<jena.version>3.17.0</jena.version>
+		<apache-httpclient.version>4.5.1</apache-httpclient.version>
 	</properties>
 	<modules>
 		<module>nunaliit2-jdbc</module>