diff --git a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
index 6afef467a..d37a48342 100644
--- a/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
+++ b/webapp/web/templates/freemarker/body/contactForm/contactForm-error.ftl
@@ -6,7 +6,7 @@
<#if errorMessage?has_content>
-

+
${errorMessage}
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index 56766c54d..ca95cfde2 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -11,7 +11,7 @@ ${stylesheets.addFromTheme("/css/uploadImages.css")}
Photo Upload
<#if errorMessage??>
-

+
${errorMessage}
#if>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index cb0e4bc08..3bb9b21cf 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -10,7 +10,7 @@ ${stylesheets.addFromTheme("/css/uploadImages.css")}
Photo Upload
<#if errorMessage??>
-

+
${errorMessage}
#if>
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
index e7b2d0f79..bf5bf0494 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--classgroup-people.ftl
@@ -1,26 +1,12 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-