Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
===================================================================
diff -u -r646110d2bf8a9cd0f9b5af069963e2961c5e9c5a -re0cc6f577e81f0a3391fe9ed633bbc94e6edd092
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision 646110d2bf8a9cd0f9b5af069963e2961c5e9c5a)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java	(.../UserRolesSaveController.java)	(revision e0cc6f577e81f0a3391fe9ed633bbc94e6edd092)
@@ -23,15 +23,6 @@
 
 package org.lamsfoundation.lams.admin.web.controller;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.admin.web.form.UserRolesForm;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
@@ -50,6 +41,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * @author jliew
  */
@@ -85,8 +84,9 @@
 
 	if (log.isDebugEnabled()) {
 	    String numRoles = roles != null ? Integer.toString(roles.length) : "0";
-	    log.debug(new StringBuilder("userId: ").append(userId).append(", orgId: ").append(orgId)
-		    .append(" will have ").append(numRoles).append(" roles").toString());
+	    log.debug(
+		    new StringBuilder("userId: ").append(userId).append(", orgId: ").append(orgId).append(" will have ")
+			    .append(numRoles).append(" roles").toString());
 	}
 	Organisation org = (Organisation) userManagementService.findById(Organisation.class, orgId);
 	User user = (User) userManagementService.findById(User.class, userId);
@@ -97,16 +97,17 @@
 	if (roles == null || roles.length < 1) {
 	    errorMap.add("roles", messageService.getMessage("error.roles.empty"));
 	    request.setAttribute("errorMap", errorMap);
-	    request.setAttribute("rolelist", userManagementService.filterRoles(rolelist,
-		    request.isUserInRole(Role.SYSADMIN), org.getOrganisationType()));
+	    request.setAttribute("rolelist",
+		    userManagementService.filterRoles(rolelist, request.isUserInRole(Role.SYSADMIN),
+			    org.getOrganisationType()));
 	    request.setAttribute("login", user.getLogin());
 	    request.setAttribute("fullName", user.getFullName());
 	    return "forward:/userroles.do";
 	}
 
 	userManagementService.setRolesForUserOrganisation(user, orgId, Arrays.asList(roles));
 
-	if (userRolesForm.isAddToLessons()) {
+	if (userRolesForm.isAddToLessons() && !orgId.equals(1)) {
 	    for (String roleIdString : roles) {
 		Integer roleId = Integer.valueOf(roleIdString);
 		if (roleId.equals(Role.ROLE_LEARNER) || roleId.equals(Role.ROLE_MONITOR)) {
@@ -121,8 +122,9 @@
     }
 
     private void auditLog(Organisation organisation, Integer userId, String[] roleIds, boolean addToLessons) {
-	List<String> roles = Stream.of(roleIds).collect(Collectors
-		.mapping(roleId -> Role.ROLE_MAP.get(Integer.valueOf(roleId)), Collectors.toUnmodifiableList()));
+	List<String> roles = Stream.of(roleIds).collect(
+		Collectors.mapping(roleId -> Role.ROLE_MAP.get(Integer.valueOf(roleId)),
+			Collectors.toUnmodifiableList()));
 	User targetUser = userManagementService.getUserById(userId);
 	StringBuilder auditLogMessage = new StringBuilder("to user ").append(targetUser.getFirstName()).append(" ")
 		.append(targetUser.getLastName()).append(" (").append(targetUser.getLogin()).append(") assigned roles ")
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -r646110d2bf8a9cd0f9b5af069963e2961c5e9c5a -re0cc6f577e81f0a3391fe9ed633bbc94e6edd092
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 646110d2bf8a9cd0f9b5af069963e2961c5e9c5a)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision e0cc6f577e81f0a3391fe9ed633bbc94e6edd092)
@@ -44,39 +44,40 @@
 		<lams:errors path="roles"/>
 				
 		<div class="container-fluid">
-		<div class="row">
-		  <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
-		  <div class="col-xs-10"><c:out value="${login}" /></div>
+			<div class="row">
+			  <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
+			  <div class="col-xs-10"><c:out value="${login}" /></div>
+			</div>
+
+			<div class="row">
+			  <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
+			  <div class="col-xs-10"><c:out value="${fullName}" /></div>
+			</div>
+
+			<div class="row">
+			  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
+			  <div class="col-xs-10">
+				<c:forEach items="${rolelist}" var="role" varStatus="index">
+					<input type="checkbox" name="roles" value="${role.roleId}"
+					<c:forEach items="${userRolesForm.roles}" var="userRole">
+						<c:if test="${userRole == role.roleId}">
+							checked="checked"
+						</c:if>
+					</c:forEach>
+					/>
+					<fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
+				</c:forEach>
+			  </div>
+			</div>
+
+			<c:if test="${userRolesForm.orgId != 1}">
+				<div class="row">
+				  <div class="col-xs-2"><fmt:message key="admin.user.add.to.lessons"/>:</div>
+				  <div class="col-xs-10"><input type="checkbox" name="addToLessons" /></div>
+				</div>
+			</c:if>
 		</div>
 		
-		<div class="row">
-		  <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
-		  <div class="col-xs-10"><c:out value="${fullName}" /></div>
-		</div>
-		
-		<div class="row">
-		  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
-		  <div class="col-xs-10">            
-		  	<c:forEach items="${rolelist}" var="role" varStatus="index">
-		    	<input type="checkbox" name="roles" value="${role.roleId}" 
-		    	<c:forEach items="${userRolesForm.roles}" var="userRole">
-		    		<c:if test="${userRole == role.roleId}">
-		    			checked="checked"
-		    		</c:if>
-		    	</c:forEach>
-		    	/>
-		        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
-		    </c:forEach>
-		  </div>
-		</div>
-		
-		<div class="row">
-		  <div class="col-xs-2"><fmt:message key="admin.user.add.to.lessons"/>:</div>
-		  <div class="col-xs-10"><input type="checkbox" name="addToLessons" /></div>
-		</div>
-		
-		</div>
-		
 		<div class="pull-right">
 			<a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.cancel"/></a>
 			<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
@@ -86,4 +87,4 @@
 		</form:form>
 	</lams:Page>
 </body>
-</lams:html>
+</lams:html>
\ No newline at end of file