diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
index 16b7f8c79bc8..228a42e6d10f 100644
--- a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
+++ b/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java
@@ -318,6 +318,10 @@ private void redirectOIDC(HttpServletRequest req, HttpServletResponse res,
 
 		byte[] bytesEncoded = Base64.encodeBase64(login_hint.getBytes());
 		String encoded_login_hint = new String(bytesEncoded);
+
+		log.debug("login_hint={}", login_hint);
+		log.debug("encoded_login_hint={}", encoded_login_hint);
+
 		try {
 			URIBuilder redirect = new URIBuilder(oidc_endpoint.trim());
 			redirect.addParameter("iss", SakaiBLTIUtil.getOurServerUrl());
diff --git a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java b/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
index 863b7fd2ccb7..2fa90e24ca52 100644
--- a/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
+++ b/basiclti/basiclti-oidc/src/java/org/sakaiproject/lti13/OIDCServlet.java
@@ -126,12 +126,16 @@ private void handleOIDCAuthorization(HttpServletRequest request, HttpServletResp
 		redirect_uri = StringUtils.trimToNull(redirect_uri);
 
 		String encoded_login_hint = (String) request.getParameter("login_hint");
+		encoded_login_hint = encoded_login_hint.replace(' ', '+');  // when posted, plus signs may become supplanted by spaces
 		byte[] valueDecoded = Base64.decodeBase64(encoded_login_hint);
 		String login_hint = new String(valueDecoded);
 		if (StringUtils.isEmpty(login_hint)) {
 			state = null;
 		}
 
+		log.debug("encoded_login_hint={}", encoded_login_hint);
+		log.debug("login_hint={}", login_hint);
+
 		String nonce = (String) request.getParameter("nonce");
 		nonce = StringUtils.trimToNull(nonce);
 
diff --git a/library/src/skins/default/src/sass/modules/tool/portal/_portal.scss b/library/src/skins/default/src/sass/modules/tool/portal/_portal.scss
index 5896ad5efde2..5d8549674532 100644
--- a/library/src/skins/default/src/sass/modules/tool/portal/_portal.scss
+++ b/library/src/skins/default/src/sass/modules/tool/portal/_portal.scss
@@ -577,3 +577,7 @@
   color: var(--sakai-text-color-1);
   background-color: var(--sakai-background-color-2);
 }
+
+i.fa {
+  width: 14px;
+}