Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rea02b970f16cb8f0cc01a6e45e45fb86b3dd3202
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java	(.../WebAppURLTag.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java	(.../WebAppURLTag.java)	(revision ea02b970f16cb8f0cc01a6e45e45fb86b3dd3202)
@@ -61,8 +61,8 @@
 		if ( HttpServletRequest.class.isInstance(sr) ) {
 			HttpServletRequest request = (HttpServletRequest) sr;
 			
-			String protocol = request.getProtocol();
-			if(protocol.startsWith("HTTPS")){
+			String protocol;
+			if(request.isSecure()){
 				protocol = "https://";
 			}else{
 				protocol = "http://";
Index: lams_monitoring/web/errorbox.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -rea02b970f16cb8f0cc01a6e45e45fb86b3dd3202
--- lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_monitoring/web/errorbox.jsp	(.../errorbox.jsp)	(revision ea02b970f16cb8f0cc01a6e45e45fb86b3dd3202)
@@ -2,8 +2,8 @@
 <%@ taglib uri="tags-logic" prefix="logic" %>
 <%@ page import="org.apache.struts.Globals" %>
 <%
-String cprotocol = request.getProtocol();
-if(cprotocol.startsWith("HTTPS")){
+String cprotocol;
+if(request.isSecure()){
 	cprotocol = "https://";
 }else{
 	cprotocol = "http://";