diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
index 6cffdc790e..8221bcf56c 100644
--- a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
+++ b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectEPersonTag.java
@@ -17,6 +17,7 @@ import javax.servlet.jsp.tagext.TagSupport;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.dspace.eperson.EPerson;
+import org.dspace.core.Utils;
 
 /**
  * <p>
@@ -122,7 +123,7 @@ public class SelectEPersonTag extends TagSupport
                 for (int i = 0; i < epeople.length; i++)
                 {
                     out.print("<option value=\"" + epeople[i].getID() + "\">");
-                    out.print(epeople[i].getFullName() + " ("
+                    out.print(Utils.addEntities(epeople[i].getFullName()) + " ("
                             + epeople[i].getEmail() + ")");
                     out.println("</option>");
                 }
diff --git a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
index 6d04104a59..04db1b04c7 100644
--- a/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
+++ b/dspace-jspui/src/main/java/org/dspace/app/webui/jsptag/SelectGroupTag.java
@@ -17,6 +17,7 @@ import javax.servlet.jsp.tagext.TagSupport;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.dspace.eperson.Group;
+import org.dspace.core.Utils;
 
 /**
  * <P>Tag for producing an e-person select widget in a form.  Somewhat
@@ -121,7 +122,7 @@ public class SelectGroupTag extends TagSupport
 				for (int i = 0; i < groups.length; i++)
 				{
 					out.print("<option value=\"" + groups[i].getID() + "\">");
-					out.print(groups[i].getName() + " (" + groups[i].getID() + ")");
+					out.print(Utils.addEntities(groups[i].getName()) + " (" + groups[i].getID() + ")");
 					out.println("</option>");
 				}
 			}
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp b/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp
index 0ed041c0ed..cbfaff4a65 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/group-group-select.jsp
@@ -29,6 +29,7 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
 
 <%@ page import="org.dspace.eperson.Group"   %>
+<%@ page import="org.dspace.core.Utils" %>
 <%@ page import="java.util.List" %>
 
 <%
@@ -57,7 +58,7 @@
                     <select class="form-control" size="15" name="groups_id" multiple="multiple">
                         <%  for (int i = 0; i < groups.size(); i++) { %>
                             <option value="<%= groups.get(i).getID()%>">
-                                <%= groups.get(i).getName()%>
+                                <%= Utils.addEntities(groups.get(i).getName())%>
                             </option>
                         <%  } %>
                 </select>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp
index cd6587941e..078f36039e 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-confirm-remove.jsp
@@ -82,7 +82,7 @@
 <div class="row">
 <label class="col-md-2"><fmt:message key="jsp.dspace-admin.supervise-confirm-remove.supervisorgroupheader"/>:</label>
 <span>
-<%= group.getName() %>
+<%= Utils.addEntities(group.getName()) %>
 </span>
 </div>
 <br/>
diff --git a/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp b/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp
index b09f232ee4..9b3ac4d23e 100644
--- a/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp
+++ b/dspace-jspui/src/main/webapp/dspace-admin/supervise-link.jsp
@@ -63,7 +63,7 @@
     for (int i = 0; i < groups.size(); i++)
     {
 %>
-                <option value="<%= groups.get(i).getID() %>"><%= groups.get(i).getName() %></option>
+                <option value="<%= groups.get(i).getID() %>"><%= Utils.addEntities(groups.get(i).getName()) %></option>
 <%
     }
 %>
diff --git a/dspace-jspui/src/main/webapp/tools/eperson-list.jsp b/dspace-jspui/src/main/webapp/tools/eperson-list.jsp
index 8a8e8e71a8..24a99be64f 100644
--- a/dspace-jspui/src/main/webapp/tools/eperson-list.jsp
+++ b/dspace-jspui/src/main/webapp/tools/eperson-list.jsp
@@ -291,7 +291,7 @@ function clearEPeople()
 			<td headers="t1">
 			    <input class="btn btn-success" type="button" value="<%
 			if (multiple) { %><fmt:message key="jsp.tools.general.add"/><% }
-			else {          %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= fullname %>');<%= closeWindow %>"/></td>
+			else {          %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addEPerson('<%= e.getID() %>', '<%= email %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/></td>
 			<td headers="t2"><%= e.getID() %></td>
 			<td headers="t3"><%= (e.getEmail() == null ? "" : Utils.addEntities(e.getEmail())) %></td>
             <td headers="t4">
diff --git a/dspace-jspui/src/main/webapp/tools/group-edit.jsp b/dspace-jspui/src/main/webapp/tools/group-edit.jsp
index 65565944f8..e08a6914a8 100644
--- a/dspace-jspui/src/main/webapp/tools/group-edit.jsp
+++ b/dspace-jspui/src/main/webapp/tools/group-edit.jsp
@@ -69,7 +69,7 @@
                parentlink="<%= link %>"
                nocache="true">
 
-	<h1><fmt:message key="jsp.tools.group-edit.title"/> : <%=group.getName()%> (id: <%=group.getID()%>)
+	<h1><fmt:message key="jsp.tools.group-edit.title"/> : <%=Utils.addEntities(group.getName())%> (id: <%=group.getID()%>)
 	<dspace:popup page="<%= LocaleSupport.getLocalizedMessage(pageContext, \"help.collection-admin\") +\"#groupeditor\"%>"><fmt:message key="jsp.help"/></dspace:popup>
 	</h1>
     <form name="epersongroup" method="post" action="">
diff --git a/dspace-jspui/src/main/webapp/tools/group-list.jsp b/dspace-jspui/src/main/webapp/tools/group-list.jsp
index abd9f76c6c..2e24f21c1b 100644
--- a/dspace-jspui/src/main/webapp/tools/group-list.jsp
+++ b/dspace-jspui/src/main/webapp/tools/group-list.jsp
@@ -27,6 +27,7 @@
 
 <%@ page import="org.dspace.eperson.EPerson" %>
 <%@ page import="org.dspace.eperson.Group" %>
+<%@ page import="org.dspace.core.Utils" %>
 <%@ page import="java.util.List" %>
 
 <%
@@ -94,7 +95,7 @@
             <tr>
                 <td class="<%= row %>RowOddCol"><%= groups.get(i).getID() %></td>
                 <td class="<%= row %>RowEvenCol">
-                    <%= groups.get(i).getName() %>
+                    <%= Utils.addEntities(groups.get(i).getName()) %>
                 </td>
                 <td class="<%= row %>RowOddCol">
 <%
diff --git a/dspace-jspui/src/main/webapp/tools/group-select-list.jsp b/dspace-jspui/src/main/webapp/tools/group-select-list.jsp
index afc283c27c..ddb055e8b5 100644
--- a/dspace-jspui/src/main/webapp/tools/group-select-list.jsp
+++ b/dspace-jspui/src/main/webapp/tools/group-select-list.jsp
@@ -175,7 +175,7 @@ function clearGroups()
 	if (multiple) { %><fmt:message key="jsp.tools.general.add"/><% }
 	else {          %><fmt:message key="jsp.tools.general.select"/><% } %>" onclick="javascript:<%= clearList %>addGroup('<%= g.getID() %>', '<%= Utils.addEntities(fullname) %>');<%= closeWindow %>"/></td>
 			<td headers="t2" class=""><%= g.getID() %></td>
-			<td headers="t3" class=""> <%= g.getName()%></td>
+			<td headers="t3" class=""> <%= Utils.addEntities(g.getName())%></td>
         </tr>
 <%
         row = (row.equals("odd") ? "even" : "odd");