Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -rebf3cd425d492a39dcd1c67df54e1f86a376ace6 -r594eae7c7c4a3fe379d52eafd68f65ebb554fbc7
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 594eae7c7c4a3fe379d52eafd68f65ebb554fbc7)
@@ -68,6 +68,8 @@
 msg.edit.tool.content.1 = This page contains a list of installed tools.
 msg.edit.tool.content.2 = Changes to a tool's content using this screen will affect the tool's default appearance for all authors.
 msg.edit.tool.content.3 = Note that you cannot upload files to a tool's default content, only edit the default text.
+msg.roles.mandatory = You must assign at least one role.
+msg.roles.mandatory.users = You must assign at least one role for each user.
 
 #======================= Organisation State =======================#
 organisation.state.ACTIVE=Active
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -rebf3cd425d492a39dcd1c67df54e1f86a376ace6 -r594eae7c7c4a3fe379d52eafd68f65ebb554fbc7
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 594eae7c7c4a3fe379d52eafd68f65ebb554fbc7)
@@ -24,6 +24,8 @@
 </h2>
 <p>&nbsp;</p>
 
+<p><fmt:message key="msg.roles.mandatory.users"/></p>
+
 <html-el:form action="/userorgrolesave.do" method="post">
 <html-el:hidden property="orgId" />
 
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -rebf3cd425d492a39dcd1c67df54e1f86a376ace6 -r594eae7c7c4a3fe379d52eafd68f65ebb554fbc7
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision ebf3cd425d492a39dcd1c67df54e1f86a376ace6)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 594eae7c7c4a3fe379d52eafd68f65ebb554fbc7)
@@ -22,6 +22,8 @@
 
 <p>&nbsp;</p>
 
+<p><fmt:message key="msg.roles.mandatory"/></p>
+
 <div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><bean:write name="roles" /></html-el:messages></div>
 <table>
     <tr>