Index: lams_admin/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_admin/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_central/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_central/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_gradebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_gradebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_learning/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_learning/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_monitoring/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_monitoring/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_chat/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_daco/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_doku/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r3d9d1f01b663c30badb319231a3a8b43e2b7646d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 3d9d1f01b663c30badb319231a3a8b43e2b7646d)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -72,6 +72,7 @@
 	        }
 	    });
 		
+		<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
 		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
 			$('#etherpad-container-${groupSummary.sessionId}').pad({
 				'padId':'${groupSummary.padId}',
@@ -81,7 +82,7 @@
 				'showChat':'${dokumaran.showChat}',
 				'showLineNumbers':'${dokumaran.showLineNumbers}',
 				'height':'600',
-				'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'
+				'userName':'<c:out value="${fullName}" />'
 			});			
 		</c:forEach>
 		
Index: lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_forum/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_images/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_images/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_larsrc/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_leader/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_leader/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_mindmap/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_nb/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_nb/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_notebook/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_pixlr/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_preview/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_preview/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_sbmt/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_scribe/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_survey/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_survey/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_task/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_task/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_vote/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_vote/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_wiki/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_tool_zoom/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}
Index: lams_www/web/WEB-INF/tags/Etherpad.tag
===================================================================
diff -u -r68a60b37cc8c4bd9372ebfdd67f612d94d0a057d -r51d4a9031e28ae9d4a57216d0118bdfa99380dbc
--- lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 68a60b37cc8c4bd9372ebfdd67f612d94d0a057d)
+++ lams_www/web/WEB-INF/tags/Etherpad.tag	(.../Etherpad.tag)	(revision 51d4a9031e28ae9d4a57216d0118bdfa99380dbc)
@@ -78,7 +78,10 @@
 							'showControls':${empty showControls ? false : showControls},
 							'showChat': ${empty showChat ? false : showChat},
 							'height': ${empty height ? 'undefined' : height}
-							<c:if test="${showControls}">,'userName':'<lams:user property="firstName" />&nbsp;<lams:user property="lastName" />'</c:if>
+							<c:if test="${showControls}">
+								<c:set var="fullName"><lams:user property="firstName" />&nbsp;<lams:user property="lastName" /></c:set>
+								,'userName':'<c:out value="${fullName}" />'
+							</c:if>
 						});
 					}
 				}