Index: C:/devel/uPortal-2.6.1-svn/source/org/jasig/portal/LoginServlet.java
===================================================================
--- C:/devel/uPortal-2.6.1-svn/source/org/jasig/portal/LoginServlet.java	(revision 43720)
+++ C:/devel/uPortal-2.6.1-svn/source/org/jasig/portal/LoginServlet.java	(working copy)
@@ -7,6 +7,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -156,9 +157,9 @@
 				redirectTarget = request.getContextPath() + "/" + redirectString;
 			} else {
 				redirectTarget = request.getContextPath() + "/" +
-				"tag.idempotent." +  redirectString + "?uP_fname=" + targetFname;
+				"tag.idempotent." +  redirectString + "?uP_fname=" + URLEncoder.encode(targetFname, "UTF-8");
 				if (targetArgs != null) {
-				redirectTarget = redirectTarget + "&uP_args=" + targetArgs;
+				redirectTarget = redirectTarget + "&uP_args=" + URLEncoder.encode(targetArgs, "UTF-8");
 				}
 			}