Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_doku/web/pages/learning/learning.jsp
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_doku/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -65,7 +65,10 @@
 				'showChat':'${dokumaran.showChat}',
 				'showLineNumbers':'${dokumaran.showLineNumbers}',
 				'height':'' + ($(window).height() - 200)
-				<c:if test="${hasEditRight}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+				<c:if test="${hasEditRight}">
+					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
+				</c:if>
 			});
 			
 			$('[data-toggle="tooltip"]').bootstrapTooltip();
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_whiteboard/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r99b0484e21db2f22ff09613d221f3364ed51e182 -r6e5200081bea4aa28f0ce8ac227c6220fd498a51
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 99b0484e21db2f22ff09613d221f3364ed51e182)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 6e5200081bea4aa28f0ce8ac227c6220fd498a51)
@@ -72,7 +72,7 @@
 				'height': ${empty height ? 'undefined' : height}
 				<c:if test="${showControls}">
 					<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
-					,'userName':'<c:out value="${fullName}" />'
+					,'userName': encodeURIComponent("<c:out value='${fullName}' />")
 				</c:if>
 			}).addClass('initialised');
 		}