Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.40 -r1.77.2.41
--- lams_central/web/main.jsp	20 Dec 2016 06:03:53 -0000	1.77.2.40
+++ lams_central/web/main.jsp	20 Dec 2016 12:20:32 -0000	1.77.2.41
@@ -82,9 +82,12 @@
 				PRIVATE_NOTIFICATIONS_READ_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_HINT_VAR}" />',
 				<fmt:message key="label.private.notifications.read.all.hint" var="PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR"/>
 				PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}" />',
-				MY_PROFILE : '<fmt:message key="index.myprofile" />',
-				REMOVE_ORG_FAVORITE : '<fmt:message key="label.remove.org.favorite"/>',
-				MARK_ORG_FAVORITE : '<fmt:message key="label.mark.org.favorite"/>'
+				<fmt:message key="index.myprofile" var="MY_PROFILE_VAR"/>
+				MY_PROFILE : '<c:out value="${MY_PROFILE_VAR}" />',
+				<fmt:message key="label.remove.org.favorite" var="REMOVE_ORG_FAVORITE_VAR"/>
+				REMOVE_ORG_FAVORITE : '<c:out value="${REMOVE_ORG_FAVORITE_VAR}" />',
+				<fmt:message key="label.mark.org.favorite" var="MARK_ORG_FAVORITE_VAR"/>
+				MARK_ORG_FAVORITE : '<c:out value="${MARK_ORG_FAVORITE_VAR}" />'
 			},
 			activeOrgId = <c:choose><c:when test="${empty lastVisitedOrganisationId}">null</c:when><c:otherwise>${lastVisitedOrganisationId}</c:otherwise></c:choose>;
 
Index: lams_monitoring/web/monitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v
diff -u -r1.27.2.43 -r1.27.2.44
--- lams_monitoring/web/monitor.jsp	9 Dec 2016 17:56:39 -0000	1.27.2.43
+++ lams_monitoring/web/monitor.jsp	20 Dec 2016 12:20:33 -0000	1.27.2.44
@@ -163,9 +163,12 @@
 				CONTRIBUTE_BUTTON : '<c:out value="${CONTRIBUTE_BUTTON_VAR}" />',
 				<fmt:message key="lesson.task.attention" var="CONTRIBUTE_ATTENTION_VAR"/>
 				CONTRIBUTE_ATTENTION : '<c:out value="${CONTRIBUTE_ATTENTION_VAR}" />',
-				HELP : '<fmt:message key="button.help"/>',
-				LESSON_INTRODUCTION : '<fmt:message key="label.lesson.introduction"/>',
-				EMAIL_TITLE : '<fmt:message key="label.email"/>'
+				<fmt:message key="button.help" var="BUTTON_HELP_VAR"/>
+				HELP : '<c:out value="${BUTTON_HELP_VAR}" />',
+				<fmt:message key="label.lesson.introduction" var="LESSON_INTRODUCTION_VAR"/>
+				LESSON_INTRODUCTION : '<c:out value="${LESSON_INTRODUCTION_VAR}" />',
+				<fmt:message key="label.email" var="EMAIL_TITLE_VAR"/>
+				EMAIL_TITLE : '<c:out value="${EMAIL_TITLE_VAR}" />'
 			}
 	    
 		$(document).ready(function(){