Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -534,4 +534,34 @@
 label.select.type=Select type...
 label.date=Date
 label.between.dates=Between dates
+label.lesson.with.name=Lesson: {0}
+
+label.type.teacher.learning.design.create=Learning Design Created
+label.type.teacher.lesson.create=Lesson Created
+label.type.teacher.lesson.start=Lesson Started
+label.type.teacher.lesson.change.state=Lesson State Changed
+label.type.learner.activity.start=Activity Started
+label.type.learner.activity.finish=Activity Finished
+label.type.learner.lesson.complete=Lesson Complete
+label.type.learner.lesson.mark.submit=Mark Submitted
+label.type.activity.edit=Activity Edited
+label.type.force.complete=Learner Force Completed
+label.type.user.org.admin=Organisation or User Changed
+label.type.login.as=Sysadmin Logged In As
+label.type.password.change=Password Change
+label.type.role.failure=Action Attempted With Wrong Roles
+label.type.account.locked=Account Locked
+label.type.notification=Notification
+label.type.mark.updated=Mark Updated
+label.type.mark.released=Mark Released
+label.type.learner.content.updated=Learner's Entry Modified
+label.type.learner.content.show.hide=Learner's Entry Shown/Hidden
+label.type.unknown=Unknown
+label.area.lesson=Lesson
+label.area.security=Security
+label.area.notification=Notification
+label.area.marks=Marks
+label.area.learner.content=Learner Entry
+label.area.unknown=Unknown
+
 #======= End labels: Exported 511 labels for en AU =====
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml
===================================================================
diff -u -rf3fbbb8ec1732de7e5ce51567287b42b55ab33e1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision f3fbbb8ec1732de7e5ce51567287b42b55ab33e1)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml	(.../adminApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -19,8 +19,8 @@
    		<property name="messageService">
    			<ref bean="adminMessageService"/>
    		</property>
-		<property name="auditService">
-			<ref bean="auditService"/>
+		<property name="logEventService">
+			<ref bean="logEventService"/>
 		</property>   		
     </bean>
 </beans>
\ No newline at end of file
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
diff -u -rf4e34e708b87e42dea1b6d667135f09840d79aa3 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision f4e34e708b87e42dea1b6d667135f09840d79aa3)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -28,6 +28,7 @@
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.integration.service.IIntegrationService;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
 import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.statistics.service.IStatisticsService;
@@ -37,7 +38,6 @@
 import org.lamsfoundation.lams.usermanagement.service.LdapService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -51,7 +51,7 @@
     private static IUserManagementService manageService;
     private static MessageService messageService;
     private static IIntegrationService integrationService;
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
     private static IImportService importService;
     private static LdapService ldapService;
     private static IStatisticsService statisticsService;
@@ -88,12 +88,12 @@
 	return AdminServiceProxy.integrationService;
     }
 
-    public static final IAuditService getAuditService(ServletContext servletContext) {
-	if (AdminServiceProxy.auditService == null) {
-	    AdminServiceProxy.auditService = (IAuditService) AdminServiceProxy.getDomainService(servletContext,
-		    "auditService");
+    public static final ILogEventService getLogEventService(ServletContext servletContext) {
+	if (AdminServiceProxy.logEventService == null) {
+	    AdminServiceProxy.logEventService = (ILogEventService) AdminServiceProxy.getDomainService(servletContext,
+		    "logEventService");
 	}
-	return AdminServiceProxy.auditService;
+	return AdminServiceProxy.logEventService;
     }
 
     public static final IImportService getImportService(ServletContext servletContext) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java	(.../IImportService.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java	(.../IImportService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -80,7 +80,7 @@
      * @return
      * @throws IOException
      */
-    public List parseGroupSpreadsheet(FormFile fileItem) throws IOException;
+    public List parseGroupSpreadsheet(FormFile fileItem, String sessionId) throws IOException;
 
     /**
      * Returns number of rows found in spreadsheet.
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r10a07b8ffe4a2ea92d2aed9a6401795213448b7e -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision 10a07b8ffe4a2ea92d2aed9a6401795213448b7e)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java	(.../ImportService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -38,7 +38,8 @@
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.admin.AdminConstants;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.AuthenticationMethod;
 import org.lamsfoundation.lams.usermanagement.Organisation;
@@ -53,7 +54,6 @@
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
@@ -70,7 +70,7 @@
     private static Logger log = Logger.getLogger(ImportService.class);
     public IUserManagementService service;
     public MessageService messageService;
-    public IAuditService auditService;
+    public ILogEventService logEventService;
 
     public IUserManagementService getService() {
 	return service;
@@ -88,12 +88,12 @@
 	this.messageService = messageService;
     }
 
-    public IAuditService getAuditService() {
-	return auditService;
+    public ILogEventService getLogEventService() {
+	return logEventService;
     }
 
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
+    public void setLogEventService(ILogEventService logEventService) {
+	this.logEventService = logEventService;
     }
 
     // spreadsheet column indexes for user spreadsheet
@@ -175,12 +175,13 @@
     // each item in the list lists the id, name, and parent's id of that org; otherwise
     // the items in the list are error messages.
     @Override
-    public List parseGroupSpreadsheet(FormFile fileItem) throws IOException {
+    public List parseGroupSpreadsheet(FormFile fileItem, String sessionId) throws IOException {
 	results = new ArrayList<ArrayList>();
 	parentOrg = service.getRootOrganisation();
 	HSSFSheet sheet = getSheet(fileItem);
 	int startRow = sheet.getFirstRowNum();
 	int endRow = sheet.getLastRowNum();
+	UserDTO userDTO = (UserDTO) SessionManager.getSession(sessionId).getAttribute(AttributeNames.USER);
 
 	ImportService.log.debug("Parsing spreadsheet rows " + startRow + " through " + endRow);
 
@@ -213,7 +214,7 @@
 		rowResult.add(org.getName());
 		rowResult.add(org.getParentOrganisation().getOrganisationId().toString());
 		rowResult.add(org.getOrganisationType().getOrganisationTypeId().toString());
-		writeOrgAuditLog(org);
+		writeOrgAuditLog(org, userDTO);
 		// if we just added a group, then the rows under it become it's subgroups
 		if (parentOrg.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.ROOT_TYPE)) {
 		    parentOrg = org;
@@ -222,7 +223,7 @@
 	    }
 	}
 	ImportService.log.debug("Found " + results.size() + " orgs in spreadsheet.");
-	writeSuccessAuditLog(successful, null, "audit.successful.organisation.import");
+	writeSuccessAuditLog(successful, userDTO, "audit.successful.organisation.import");
 	return results;
     }
 
@@ -274,7 +275,8 @@
 
 	org.setOrganisationType((OrganisationType) service.findById(OrganisationType.class,
 		parentOrg.getOrganisationType().getOrganisationTypeId().equals(OrganisationType.ROOT_TYPE)
-			? OrganisationType.COURSE_TYPE : OrganisationType.CLASS_TYPE));
+			? OrganisationType.COURSE_TYPE
+			: OrganisationType.CLASS_TYPE));
 
 	org.setParentOrganisation(parentOrg);
 	org.setCourseAdminCanAddNewUsers(parseBooleanCell(row.getCell(ImportService.ADMIN_ADD_NEW_USERS)));
@@ -811,15 +813,18 @@
 	args[0] = user.getLogin() + "(" + user.getUserId() + ")";
 	args[1] = user.getFullName();
 	String message = messageService.getMessage("audit.user.create", args);
-	auditService.log(userDTO, AdminConstants.MODULE_NAME, message);
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, userDTO != null ? userDTO.getUserID() : null,
+		user.getUserId(), null, null, message);
+
     }
 
-    private void writeOrgAuditLog(Organisation org) {
+    private void writeOrgAuditLog(Organisation org, UserDTO userDTO) {
 	String[] args = new String[2];
 	args[0] = org.getName() + "(" + org.getOrganisationId() + ")";
 	args[1] = org.getOrganisationType().getName();
 	String message = messageService.getMessage("audit.organisation.create", args);
-	auditService.log(AdminConstants.MODULE_NAME, message);
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, userDTO != null ? userDTO.getUserID() : null, null, null,
+		null, message);
     }
 
     private void writeErrorsAuditLog(int row, List<String> list, UserDTO userDTO) {
@@ -831,16 +836,14 @@
     private void writeErrorAuditLog(int row, String error, UserDTO userDTO) {
 	String[] args = { Integer.toString(row), error };
 	String message = messageService.getMessage("audit.spreadsheet.error", args);
-	auditService.log(userDTO, AdminConstants.MODULE_NAME, message);
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, userDTO != null ? userDTO.getUserID() : null, null, null,
+		null, message);
     }
 
     private void writeSuccessAuditLog(int successful, UserDTO userDTO, String key) {
 	String[] args = { Integer.toString(successful) };
 	String message = messageService.getMessage(key, args);
-	if (userDTO == null) {
-	    auditService.log(AdminConstants.MODULE_NAME, message);
-	} else {
-	    auditService.log(userDTO, AdminConstants.MODULE_NAME, message);
-	}
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, userDTO != null ? userDTO.getUserID() : null, null, null,
+		null, message);
     }
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java	(.../ImportGroupsAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportGroupsAction.java	(.../ImportGroupsAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -36,6 +36,7 @@
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.service.IImportService;
 import org.lamsfoundation.lams.admin.web.form.ImportExcelForm;
+import org.lamsfoundation.lams.web.session.SessionManager;
 
 /**
  * @author jliew
@@ -69,7 +70,8 @@
 	    return mapping.findForward("importGroups");
 	}
 
-	List results = importService.parseGroupSpreadsheet(file);
+	String sessionId = SessionManager.getSession().getId();
+	List results = importService.parseGroupSpreadsheet(file, sessionId);
 	request.setAttribute("results", results);
 
 	return mapping.findForward("importGroups");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java	(.../LogEventAction.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/LogEventAction.java	(.../LogEventAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -47,6 +47,7 @@
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -60,6 +61,7 @@
 public class LogEventAction extends LamsDispatchAction {
 
     private static ILogEventService logEventService;
+    private MessageService messageService;
     private static SimpleDateFormat START_DATE_FORMAT = new SimpleDateFormat("YYYY-MM-DD");
 
     @Override
@@ -82,20 +84,24 @@
 
 	logEventService = getLogEventService();
 
+	if (messageService == null) {
+	    messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext());
+	}
+
 	// get the log type data and return display for user selection. Also get the start and stop dates from the log.
 	// TODO check conversion the dates to the user's timezone
 	List<LogEventType> types = logEventService.getEventTypes();
 	List<LogEventTypeDTO> convertedTypes = new ArrayList<LogEventTypeDTO>(types.size());
-	for ( LogEventType type : types ) {
-	    // TODO get message from the I18N files
-	    convertedTypes.add(new LogEventTypeDTO(type, type.getDescription().toLowerCase(), type.getArea().toLowerCase()));
+	for (LogEventType type : types) {
+	    convertedTypes.add(new LogEventTypeDTO(type, messageService.getMessage(type.getDescriptionI18NKey()),
+		    messageService.getMessage(type.getAreaI18NKey())));
 	}
 	request.setAttribute("eventLogTypes", convertedTypes);
 	
 	// jsp page expects date of the first audit log entry as YYYY-DD-MM. 
 	Date oldestDate = logEventService.getOldestEventDate();
 //	oldestDate = DateUtil.convertToTimeZoneFromDefault(userTimeZone, oldestDate);
-	request.setAttribute("startDate", START_DATE_FORMAT.format(oldestDate));
+	request.setAttribute("startDate", START_DATE_FORMAT.format(oldestDate != null ? oldestDate : new Date()) );
 	return mapping.findForward("success");
     }
 
@@ -156,26 +162,31 @@
 	
 	String area = WebUtil.readStrParam(request,  "area", true);
 	Integer typeId = WebUtil.readIntParam(request,  "typeId", true);
-	List<LogEvent> events = logEventService.getEventsForTablesorter(page, size, sorting, null, startDate, endDate, area, typeId);
+	List<Object[]> events = logEventService.getEventsForTablesorter(page, size, sorting, null, startDate, endDate, area, typeId);
 	    
 	JSONArray rows = new JSONArray();
 	JSONObject responsedata = new JSONObject();
 	responsedata.put("total_rows", logEventService.countEventsWithRestrictions(null, startDate, endDate, area, typeId));
 
-	for (LogEvent event: events) {
+	for (Object[] eventDetails : events) {
+	    if (eventDetails.length > 0) {
+		LogEvent event = (LogEvent) eventDetails[0];
+		JSONObject responseRow = new JSONObject();
 
-	    JSONObject responseRow = new JSONObject();
-
-	    responseRow.put("dateOccurred", event.getOccurredDateTime());
-	    responseRow.put("typeId", event.getLogEventTypeId());
-	    responseRow.put("description", event.getDescription());
-	    User user = event.getUser();
-	    if ( user != null ) {
-		responseRow.put("userPortraitId", user.getPortraitUuid());
-	    	responseRow.put("userId", user.getUserId());
-	    	responseRow.put("userName", user.getLogin());
+		responseRow.put("dateOccurred", event.getOccurredDateTime());
+		responseRow.put("typeId", event.getLogEventTypeId());
+		responseRow.put("description", event.getDescription());
+		User user = event.getUser();
+		if (user != null) {
+		    responseRow.put("userPortraitId", user.getPortraitUuid());
+		    responseRow.put("userId", user.getUserId());
+		    responseRow.put("userName", user.getLogin());
+		}
+		if ( eventDetails.length > 1 && eventDetails[1] != null ) {
+		    responseRow.put("lesson", eventDetails[1] );
+		}
+		rows.put(responseRow);
 	    }
-	    rows.put(responseRow);
 	}
 	responsedata.put("rows", rows);
 	response.setContentType("application/json;charset=utf-8");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java	(.../OrgSaveAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -38,8 +38,9 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
-import org.lamsfoundation.lams.admin.AdminConstants;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
@@ -48,7 +49,6 @@
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -139,7 +139,7 @@
 			    .getOrganisationStateId().equals(OrganisationState.ARCHIVED)) {
 			org.setArchivedDate(new Date());
 		    }
-		    writeAuditLog(org, orgForm, state, locale);
+		    writeAuditLog(user, org, orgForm, state, locale);
 		    BeanUtils.copyProperties(org, orgForm);
 		} else {
 		    request.setAttribute("errorName", "UserAction");
@@ -153,7 +153,7 @@
 			(Organisation) service.findById(Organisation.class, (Integer) orgForm.get("parentId")));
 		org.setOrganisationType(
 			(OrganisationType) service.findById(OrganisationType.class, (Integer) orgForm.get("typeId")));
-		writeAuditLog(org, orgForm, org.getOrganisationState(), org.getLocale());
+		writeAuditLog(user, org, orgForm, org.getOrganisationState(), org.getLocale());
 	    }
 	    org.setLocale(locale);
 	    org.setOrganisationState(state);
@@ -170,12 +170,12 @@
 	}
     }
 
-    private void writeAuditLog(Organisation org, DynaActionForm orgForm, OrganisationState newState,
+    private void writeAuditLog(UserDTO user, Organisation org, DynaActionForm orgForm, OrganisationState newState,
 	    SupportedLocale newLocale) {
 
 	WebApplicationContext ctx = WebApplicationContextUtils
 		.getRequiredWebApplicationContext(getServlet().getServletContext());
-	IAuditService auditService = (IAuditService) ctx.getBean("auditService");
+	ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService");
 	MessageService messageService = (MessageService) ctx.getBean("adminMessageService");
 
 	String message;
@@ -190,50 +190,57 @@
 		args[2] = org.getOrganisationState().getDescription();
 		args[3] = newState.getDescription();
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!StringUtils.equals(org.getName(), (String) orgForm.get("name"))) {
 		args[0] = "name";
 		args[2] = org.getName();
 		args[3] = (String) orgForm.get("name");
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!StringUtils.equals(org.getCode(), (String) orgForm.get("code"))) {
 		args[0] = "code";
 		args[2] = org.getCode();
 		args[3] = (String) orgForm.get("code");
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!StringUtils.equals(org.getDescription(), orgForm.getString("description"))) {
 		args[0] = "description";
 		args[2] = org.getDescription();
 		args[3] = (String) orgForm.get("description");
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!org.getCourseAdminCanAddNewUsers().equals(orgForm.get("courseAdminCanAddNewUsers"))) {
 		args[0] = "courseAdminCanAddNewUsers";
 		args[2] = org.getCourseAdminCanAddNewUsers() ? "true" : "false";
 		args[3] = (Boolean) orgForm.get("courseAdminCanAddNewUsers") ? "true" : "false";
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!org.getCourseAdminCanBrowseAllUsers().equals(orgForm.get("courseAdminCanBrowseAllUsers"))) {
 		args[0] = "courseAdminCanBrowseAllUsers";
 		args[2] = org.getCourseAdminCanBrowseAllUsers() ? "true" : "false";
 		args[3] = (Boolean) orgForm.get("courseAdminCanBrowseAllUsers") ? "true" : "false";
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    if (!org.getCourseAdminCanChangeStatusOfCourse()
 		    .equals(orgForm.get("courseAdminCanChangeStatusOfCourse"))) {
 		args[0] = "courseAdminCanChangeStatusOfCourse";
 		args[2] = org.getCourseAdminCanChangeStatusOfCourse() ? "true" : "false";
 		args[3] = (Boolean) orgForm.get("courseAdminCanChangeStatusOfCourse") ? "true" : "false";
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	    /*
 	     * this field not set yet
@@ -251,14 +258,16 @@
 		args[2] = org.getLocale().getDescription();
 		args[3] = newLocale.getDescription();
 		message = messageService.getMessage(key, args);
-		auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	    }
 	} else {
 	    String[] args = new String[2];
 	    args[0] = org.getName() + "(" + org.getOrganisationId() + ")";
 	    args[1] = org.getOrganisationType().getName();
 	    message = messageService.getMessage("audit.organisation.create", args);
-	    auditService.log(AdminConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null,
+			null, null, null, message);
 	}
     }
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
===================================================================
diff -u -r39f1f7974c647ec9524ebb630759a27094027c9c -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java	(.../UserAction.java)	(revision 39f1f7974c647ec9524ebb630759a27094027c9c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java	(.../UserAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.admin.web.action;
 
 import java.util.ArrayList;
@@ -39,9 +38,10 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.DynaActionForm;
-import org.lamsfoundation.lams.admin.AdminConstants;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.themes.service.IThemeService;
 import org.lamsfoundation.lams.timezone.Timezone;
@@ -57,11 +57,14 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * @author Jun-Dir Liew
@@ -129,7 +132,8 @@
 	    if (!canEdit) {
 		OrganisationType orgType = org.getOrganisationType();
 		Integer orgIdOfCourse = orgType.getOrganisationTypeId().equals(OrganisationType.CLASS_TYPE)
-			? org.getParentOrganisation().getOrganisationId() : orgId;
+			? org.getParentOrganisation().getOrganisationId()
+			: orgId;
 		User requestor = service.getUserByLogin(request.getRemoteUser());
 		if (service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_ADMIN)
 			|| service.isUserInRole(requestor.getUserId(), orgIdOfCourse, Role.GROUP_MANAGER)) {
@@ -176,7 +180,7 @@
 	    }
 	    userForm.set("userTheme", userSelectedTheme);
 	    userForm.set("initialPortraitId", user.getPortraitUuid());
-	    
+
 	    //property available for modification only to sysadmins
 	    userForm.set("twoFactorAuthenticationEnabled", user.isTwoFactorAuthenticationEnabled());
 	} else { // create a user
@@ -188,7 +192,7 @@
 	    }
 	}
 	userForm.set("orgId", (org == null ? null : org.getOrganisationId()));
-	
+
 	// sysadmins can mark users as required to use two-factor authentication
 	if (request.isUserInRole(Role.SYSADMIN)) {
 	    request.setAttribute("isSysadmin", true);
@@ -314,15 +318,17 @@
 	    request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
 	    return mapping.findForward("error");
 	}
+	UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
 	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
 	Integer userId = WebUtil.readIntParam(request, "userId");
 	service.disableUser(userId);
 	String[] args = new String[1];
 	args[0] = userId.toString();
 	String message = messageService.getMessage("audit.user.disable", args);
-	AdminServiceProxy.getAuditService(getServlet().getServletContext()).log(AdminConstants.MODULE_NAME, message);
-
+	ILogEventService logEventService = AdminServiceProxy.getLogEventService(getServlet().getServletContext());
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId,
+		null, null, message);
 	if ((orgId == null) || (orgId == 0)) {
 	    return mapping.findForward("usersearch");
 	} else {
@@ -341,6 +347,7 @@
 	    request.setAttribute("errorMessage", messageService.getMessage("error.authorisation"));
 	    return mapping.findForward("error");
 	}
+	UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
 	Integer orgId = WebUtil.readIntParam(request, "orgId", true);
 	Integer userId = WebUtil.readIntParam(request, "userId");
@@ -354,8 +361,9 @@
 	String[] args = new String[1];
 	args[0] = userId.toString();
 	String message = messageService.getMessage("audit.user.delete", args);
-	AdminServiceProxy.getAuditService(getServlet().getServletContext()).log(AdminConstants.MODULE_NAME, message);
-
+	ILogEventService logEventService = AdminServiceProxy.getLogEventService(getServlet().getServletContext());
+	logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin != null ? sysadmin.getUserID() : null, userId,
+		null, null, message);
 	if ((orgId == null) || (orgId == 0)) {
 	    return mapping.findForward("usersearch");
 	} else {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java	(.../UserSaveAction.java)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java	(.../UserSaveAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -37,7 +37,6 @@
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.action.DynaActionForm;
-import org.lamsfoundation.lams.admin.AdminConstants;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.themes.Theme;
@@ -92,6 +91,7 @@
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "Only Sysadmin has edit permisions");
 	    return null;
 	}
+	UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
 	UserSaveAction.log.debug("orgId: " + orgId);
 	Boolean edit = false;
@@ -214,7 +214,7 @@
 			UserSaveAction.service.saveUser(user);
 
 			// make 'create user' audit log entry
-			UserSaveAction.service.auditUserCreated(user, AdminConstants.MODULE_NAME);
+			UserSaveAction.service.logUserCreated(user, sysadmin);
 
 			UserSaveAction.log.debug("user: " + user.toString());
 		    }
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -18,6 +18,9 @@
 
 <script type="text/javascript">
 
+	<fmt:message key="label.lesson.with.name" var="LESSON_LABEL_VAR"><fmt:param value="{0}"/></fmt:message>
+	const LESSON_LABEL = '<c:out value="${LESSON_LABEL_VAR}" />';
+
 	var areaMenu, 
 		typeMenu,
 		areaTypeMenus = {},
@@ -27,7 +30,7 @@
 	$(document).ready(function(){
 		debugger;
 		<c:forEach var="eventType" items="${eventLogTypes}">
-			addEventType('${eventType.id}','${eventType.description}','${eventType.areaCode}','${eventType.areaDescription}');
+			addEventType("${eventType.id}","${eventType.description}","${eventType.areaCode}","${eventType.areaDescription}");
 		</c:forEach>		
 		
 		areaMenu = document.getElementById("areaMenu");
@@ -55,7 +58,8 @@
 		    sortInitialOrder: 'desc',
 		    sortList: [[0]],
 		    widgets: [ "uitheme", "resizable", "filter" ],
-		    headers: { 0: { filter: false}, 1: { filter: false}, 2: { filter: false, sorter: false}, 3: { filter: false, sort: false} }, 
+		    headers: { 0: { filter: false}, 1: { filter: false, sorter: false}, 2: { filter: false, sorter: false}, 3: { filter: false, sort: false} }, 
+		    sortList : [[0,1]],
 		    widgetOptions: {
 		    	resizable: true,
 		    	// include column filters 
@@ -89,7 +93,7 @@
 							
 							rows += '<tr>';
 
-							rows += '<td>';
+							rows += '<td style="width:20%">';
 							rows += 	logData['dateOccurred'];
 							rows += '</td>';
 
@@ -106,11 +110,22 @@
 							rows += '</td>';
 
 							rows += '<td>';
-							rows += 	definePortraitPopover(logData['userPortraitId'], logData['userId'], logData['userName'], logData['userName']);
+							if ( logData['userId'] ) {
+								rows += 	definePortraitPopover(logData['userPortraitId'], logData['userId'], logData['userName'], logData['userName']);
+							} else {
+								rows += '-';
+							}
 							rows += '</td>';
 
 							rows += '<td>';
-							rows += 	logData['description'] ? logData['description'] : '-';
+							if ( logData['lesson'] && logData['description'] ) {
+								debugger;
+								rows += LESSON_LABEL.replace('{0}',logData['lesson'])+'<BR/>'+logData['description'];
+							} else if ( logData['lesson'] ) {
+								rows += 	logData['lesson'];
+							} else if ( logData['description'] ) {
+								rows += 	logData['description'];
+							}
 							rows += '</td>';
 
 							rows += '</tr>';
@@ -205,7 +220,7 @@
 
 	<div class="voffset10">	
 	<lams:TSTable numColumns="4" dataId="data-session-id='1'">
-			<th><fmt:message key="label.date"/></th>
+			<th style="width:20%"><fmt:message key="label.date"/></th>
 			<th><fmt:message key="label.event.type"/></th>
 			<th><fmt:message key="admin.user.login"/></th>
 			<th></th>
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -1509,12 +1509,18 @@
 	    copyLearningDesignToolContent(design, design, design.getCopyTypeID(), customCSV);
 	}
 
-	logEventService.logEvent(LogEvent.TYPE_TEACHER_LEARNING_DESIGN_CREATE, userID, design.getLearningDesignId(),
-		null, null);
+	insertEventLogEntry(user, design, null);
 
 	return design;
     }
 
+    private void insertEventLogEntry(User user, LearningDesign design, Date createDate) {
+	String message = new StringBuilder("Learning design ").append(design.getTitle()).append("(")
+		.append(design.getLearningDesignId()).append(") created by ").append(user.getLogin())
+		.append("(").append(user.getUserId()).append(").").toString();
+	logEventService.logEvent(LogEvent.TYPE_TEACHER_LEARNING_DESIGN_CREATE, user.getUserId(), null, null, null, message, createDate);
+    }
+
     /**
      * Validate the learning design, updating the valid flag appropriately.
      *
@@ -1744,12 +1750,7 @@
 
 	Long learningDesingID = learningDesign.getLearningDesignId();
 
-	LogEvent logEvent = new LogEvent();
-	logEvent.setLogEventTypeId(LogEvent.TYPE_TEACHER_LEARNING_DESIGN_CREATE);
-	logEvent.setTargetId(learningDesingID); // TODO fix ids
-	logEvent.setUser(user);
-	logEvent.setOccurredDateTime(learningDesign.getCreateDateTime());
-	baseDAO.insert(logEvent);
+	insertEventLogEntry(user, learningDesign, learningDesign.getCreateDateTime());
 
 	if (log.isDebugEnabled()) {
 	    log.debug("Created a single activity LD with ID: " + learningDesingID);
Index: lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
===================================================================
diff -u -re57c5f124d643991b5d13901d32bc686acabe706 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision e57c5f124d643991b5d13901d32bc686acabe706)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java	(.../ForgotPasswordServlet.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -20,7 +20,6 @@
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.Emailer;
 import org.lamsfoundation.lams.util.FileUtilException;
@@ -253,7 +252,7 @@
 	if (nowLong < cutoffTime) {
 	    User user = (User) userService.findById(User.class, fp.getUserId());
 	    userService.updatePassword(user.getLogin(), newPassword);
-	    userService.auditPasswordChanged(user, CentralConstants.MODULE_NAME);
+	    userService.logPasswordChanged(user, user);
 	    languageKey = ForgotPasswordServlet.SUCCESS_CHANGE_PASS;
 	    success = 1;
 	} else {
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java
===================================================================
diff -u -rfd43a187f3eba4f64c02caf4ba1fcd86c3255883 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java	(.../LoginAsAction.java)	(revision fd43a187f3eba4f64c02caf4ba1fcd86c3255883)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java	(.../LoginAsAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -31,14 +31,14 @@
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.lamsfoundation.lams.integration.security.RandomPasswordGenerator;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.security.UniversalLoginModule;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -68,10 +68,10 @@
 		if (user != null) {
 		    // audit log when loginas
 		    UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
-		    IAuditService auditService = (IAuditService) ctx.getBean("auditService");
+		    ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService");
 		    String[] args = new String[] { sysadmin.getLogin() + "(" + sysadmin.getUserID() + ")", login };
 		    String message = messageService.getMessage("audit.admin.loginas", args);
-		    auditService.log(CentralConstants.MODULE_NAME, message);
+		    logEventService.logEvent(LogEvent.TYPE_LOGIN_AS, sysadmin.getUserID(), user.getUserId(), null, null, message);
 
 		    // login.jsp knows what to do with these
 		    request.setAttribute("login", login);
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
diff -u -r047d1fe03a7bf51a7978a5658686947879611bff -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 047d1fe03a7bf51a7978a5658686947879611bff)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -33,13 +33,13 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -121,12 +121,12 @@
 			service.saveUser(user);
 
 			// make 'password changed' audit log entry
-			IAuditService auditService = (IAuditService) ctx.getBean("auditService");
+			ILogEventService logEventService = (ILogEventService) ctx.getBean("logEventService");
 			MessageService messageService = (MessageService) ctx.getBean("centralMessageService");
 			String[] args = new String[1];
 			args[0] = user.getLogin() + "(" + user.getUserId() + ")";
 			String message = messageService.getMessage("audit.user.password.change", args);
-			auditService.log(CentralConstants.MODULE_NAME, message);
+			logEventService.logEvent(LogEvent.TYPE_LOGIN_AS, user.getUserId(), user.getUserId(), null, null, message);
 		    }
 		}
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
===================================================================
diff -u -r1783f39beaef59b68da9b1f1fe51004326254e16 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision 1783f39beaef59b68da9b1f1fe51004326254e16)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -39,15 +39,15 @@
 import org.apache.struts.action.ActionMessages;
 import org.apache.struts.upload.FormFile;
 import org.lamsfoundation.lams.contentrepository.NodeKey;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.CentralConstants;
 import org.lamsfoundation.lams.util.CentralToolContentHandler;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.imgscalr.ResizePictureUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -63,7 +63,7 @@
 
     private static Logger log = Logger.getLogger(PortraitSaveAction.class);
     private static IUserManagementService service;
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
     private static MessageService messageService;
     private static CentralToolContentHandler centralToolContentHandler;
     private static final String PORTRAIT_DELETE_AUDIT_KEY = "audit.delete.portrait";
@@ -179,10 +179,11 @@
 	User userToModify = (User) getService().findById(User.class, userId);
 	if (userToModify != null && userToModify.getPortraitUuid() != null) {
 
+	    UserDTO sysadmin = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	    Object[] args = new Object[] { userToModify.getFullName(), userToModify.getLogin(),
 		    userToModify.getUserId(), userToModify.getPortraitUuid() };
 	    String auditMessage = getMessageService().getMessage(PORTRAIT_DELETE_AUDIT_KEY, args);
-	    getAuditService().log(CentralConstants.MODULE_NAME, auditMessage);
+	    getLogEventService().logEvent(LogEvent.TYPE_USER_ORG_ADMIN, sysadmin.getUserID(), userId, null, null, auditMessage);
 
 	    try {
 		getCentralToolContentHandler().deleteFile(userToModify.getPortraitUuid());
@@ -220,13 +221,13 @@
 	return service;
     }
 
-    private IAuditService getAuditService() {
-	if (PortraitSaveAction.auditService == null) {
+    private ILogEventService getLogEventService() {
+	if (PortraitSaveAction.logEventService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
 		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    PortraitSaveAction.auditService = (IAuditService) ctx.getBean("auditService");
+	    PortraitSaveAction.logEventService = (ILogEventService) ctx.getBean("logEventService");
 	}
-	return PortraitSaveAction.auditService;
+	return PortraitSaveAction.logEventService;
     }
 
     private MessageService getMessageService() {
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	(.../LogEvent.hbm.xml)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/logevent/LogEvent.hbm.xml	(.../LogEvent.hbm.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -59,11 +59,11 @@
         />
 
         <property
-            name="targetId"
-            type="java.lang.Long"
+            name="targetUserId"
+            type="java.lang.Integer"
             update="true"
             insert="true"
-            column="target_id"
+            column="target_user_id"
         />
 
         <property
Index: lams_common/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4892098aa6c6dd64a2a39eb552d8458f749d3c63 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4892098aa6c6dd64a2a39eb552d8458f749d3c63)
+++ lams_common/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -25,9 +25,9 @@
 theme.service.setTheme.type.invalid  =Invalid theme type.
 theme.service.setTheme.noSuchTheme  =No such theme exists.
 theme.service.setTheme.noSuchUser  =No such User exists.
-audit.change.entry  =Changed text for user {0}. Old text: {1} New Text: {2}
-audit.hide.entry  =Hide entry for user {0}. Entry was {1}
-audit.show.entry  =Show entry for user {0}. Entry was {1}
+audit.change.entry  =Tool {3} Changed text for user {0}. Old text: {1} New Text: {2}.
+audit.hide.entry  =Tool {2} Hide entry for user {0}. Entry was {1}
+audit.show.entry  =Tool {2} Show entry for user {0}. Entry was {1}
 group.name.prefix  =Group
 imported.permission.gate.title  =Permission gate
 imported.synchronise.gate.title  =Synchronise gate
@@ -66,7 +66,7 @@
 email.notifications.activity  =activity
 error.requires.existing.grouping  =Activity {0} requires existing grouping but no group for user {1} exists yet.
 validation.error.GroupingNotUsed  =Grouping is not used in any of activities
-audit.change.mark  =Changed mark for user {0}. Old mark: {1}, new mark: {2}
+audit.change.mark  =Tool {3} Changed mark for user {0}. Old mark: {1}, new mark: {2}
 audit.started.editing.activity  =Teacher {0} has started editing activity {1} in monitor
 audit.finished.editing.activity  =Teacher {0} has finished editing activity {1} in monitor
 audit.cancelled.editing.activity  =Teacher {0} has cancelled editing activity {1} in monitor
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -408,7 +408,9 @@
 		</property>
 		<property name ="target">
 			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
+				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
 				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
+				<property name="messageService"><ref bean="commonMessageService"/></property>
 				<property name="userManagementService"><ref bean="userManagementService"/></property>
 			</bean>	
 		</property>
@@ -456,7 +458,7 @@
 	<!-- Security service -->
 	<bean id="securityServiceTarget" class="org.lamsfoundation.lams.security.SecurityService">
 		<property name="securityDAO"><ref bean="securityDAO"/></property>
-		<property name="auditService"><ref bean="auditService"/></property>
+		<property name="logEventService"><ref bean="logEventService"/></property>
 	</bean>	
 	
 	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180123.sql
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180123.sql	(.../patch20180123.sql)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180123.sql	(.../patch20180123.sql)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -9,17 +9,18 @@
 SET area = "LESSON";
 
 INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(9, 'TYPE_ACTIVITY_EDIT', 'LESSON');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(10, 'TYPE_USER_ORG_ADMIN', 'SECURITY');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(11, 'TYPE_LOGIN_AS', 'SECURITY');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(12, 'TYPE_PASSWORD_CHANGE', 'SECURITY');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(13, 'TYPE_ROLE_FAILURE', 'SECURITY');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(14, 'TYPE_ACCOUNT_LOCKED', 'SECURITY');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(15, 'TYPE_NOTIFICATION', 'NOTIFICATION');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(16, 'MARK_UPDATED', 'MARKS');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(17, 'MARK_RELEASED', 'MARKS');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(18, 'LEARNER_CONTENT_UPDATED', 'LEARNER_CONTENT');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(19, 'LEARNER_CONTENT_SHOW_HIDE', 'LEARNER_CONTENT');
-INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(20, 'UNKNOWN', 'UNKNOWN');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(10, 'TYPE_FORCE_COMPLETE', 'LESSON');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(11, 'TYPE_USER_ORG_ADMIN', 'SECURITY');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(12, 'TYPE_LOGIN_AS', 'SECURITY');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(13, 'TYPE_PASSWORD_CHANGE', 'SECURITY');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(14, 'TYPE_ROLE_FAILURE', 'SECURITY');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(15, 'TYPE_ACCOUNT_LOCKED', 'SECURITY');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(16, 'TYPE_NOTIFICATION', 'NOTIFICATION');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(17, 'TYPE_MARK_UPDATED', 'MARKS');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(18, 'TYPE_MARK_RELEASED', 'MARKS');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(19, 'TYPE_LEARNER_CONTENT_UPDATED', 'LEARNER_CONTENT');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(20, 'TYPE_LEARNER_CONTENT_SHOW_HIDE', 'LEARNER_CONTENT');
+INSERT INTO lams_log_event_type (log_event_type_id, description, area) VALUES(21, 'TYPE_UNKNOWN', 'UNKNOWN');
 
 ALTER TABLE lams_log_event 
 DROP FOREIGN KEY FK_lams_event_log_5,
@@ -29,8 +30,10 @@
 DROP FOREIGN KEY FK_lams_event_log_1;
 
 ALTER TABLE lams_log_event 
-CHANGE COLUMN learning_design_id target_id BIGINT(20) NULL DEFAULT NULL ,
-ADD COLUMN description TEXT,
+MODIFY COLUMN user_id BIGINT(20) NULL,
+DROP COLUMN learning_design_id,
+ADD COLUMN target_user_id BIGINT(20) NULL,
+ADD COLUMN description TEXT NULL,
 DROP INDEX occurred_date_time ,
 ADD INDEX event_log_occurred_date_time (occurred_date_time ASC),
 ADD INDEX FK_event_log_event_type_idx (log_event_type_id ASC),
Index: lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
===================================================================
diff -u -rb2f5b5e883428dc03539ca5ed1ca323d1ab4e092 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java	(.../SsoHandler.java)	(revision b2f5b5e883428dc03539ca5ed1ca323d1ab4e092)
+++ lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java	(.../SsoHandler.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -42,13 +42,14 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.usermanagement.service.UserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -63,7 +64,7 @@
  *
  */
 public class SsoHandler implements ServletExtension {
-    private static IAuditService auditService = null;
+    private static ILogEventService logEventService = null;
     private static IUserManagementService userManagementService = null;
 
     protected static final String SESSION_KEY = "io.undertow.servlet.form.auth.redirect.location";
@@ -204,9 +205,12 @@
 			Long currentTimeMillis = System.currentTimeMillis();
 			Date date = new Date(currentTimeMillis + lockOutTimeMillis);
 			user.setLockOutTime(date);
-			getAuditService(session.getServletContext()).log(userDTO, "sso",
-				"User is locked out for " + Configuration.getAsInt(ConfigurationKeys.LOCK_OUT_TIME)
-					+ " mins after " + failedAttempts + " failed attempts.");
+			String message = new StringBuilder("User ").append(user.getLogin()).append("(")
+				.append(user.getUserId()).append(") is locked out for ")
+				.append(Configuration.getAsInt(ConfigurationKeys.LOCK_OUT_TIME)).append(" mins after ")
+				.append(failedAttempts).append(" failed attempts.").toString();
+			getLogEventService(session.getServletContext()).logEvent(LogEvent.TYPE_ACCOUNT_LOCKED,
+				user.getUserId(), user.getUserId(), null, null, message);
 		    }
 		    getUserManagementService(session.getServletContext()).save(user);
 		}
@@ -300,11 +304,11 @@
 	return SsoHandler.userManagementService;
     }
 
-    protected IAuditService getAuditService(ServletContext context) {
-	if (SsoHandler.auditService == null) {
+    protected ILogEventService getLogEventService(ServletContext context) {
+	if (SsoHandler.logEventService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(context);
-	    SsoHandler.auditService = (IAuditService) ctx.getBean("auditService");
+	    SsoHandler.logEventService = (ILogEventService) ctx.getBean("logEventService");
 	}
-	return SsoHandler.auditService;
+	return SsoHandler.logEventService;
     }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
===================================================================
diff -u -rfba2480356aa5ddda0c8308eb917d72d16aa32eb -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(.../ILessonDAO.java)	(revision fba2480356aa5ddda0c8308eb917d72d16aa32eb)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java	(.../ILessonDAO.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -142,6 +142,12 @@
     Lesson getLessonForActivity(long activityId);
 
     /**
+     * Get the lesson and activity ids that apply to the tool activity associated with this tool content id. 
+     * Returns an array of two longs.
+     */
+     Object[] getLessonActivityForActivity(long toolContentId);
+    
+    /**
      * Gets all non-removed lessons for a user in an org; set userRole parameter to learner if you want lessons where
      * user is in the learner list, or to monitor if in the staff list.
      *
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
===================================================================
diff -u -rff448aacbef534e7fb4b5a76fe497eee0e9439da -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision ff448aacbef534e7fb4b5a76fe497eee0e9439da)
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java	(.../LessonDAO.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.tools.Tool;
+
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.FetchMode;
@@ -63,6 +65,11 @@
     private final static String FIND_LESSON_FOR_ACTIVITY = "select lesson from " + Lesson.class.getName() + " lesson, "
 	    + Activity.class.getName() + " activity "
 	    + " where activity.activityId=:activityId and activity.learningDesign=lesson.learningDesign";
+    private final static String FIND_LESSON_ACTIVITY_BY_TOOL_CONTENT_ID = "SELECT lesson.lessonId, activity.activityId, tool.toolSignature FROM "
+	    + Lesson.class.getName() + " lesson, "
+	    + Activity.class.getName() + " activity "
+	    + Tool.class.getName() + " tool "
+	    + " WHERE activity.toolContentId=:toolContentId activity.toolId = tool.toolId and activity.learningDesign=lesson.learningDesign";
     private final static String LESSONS_WITH_ORIGINAL_LEARNING_DESIGN = "select l from " + Lesson.class.getName()
 	    + " l " + "where l.learningDesign.originalLearningDesign.learningDesignId = ? "
 	    + "and l.learningDesign.copyTypeID != " + LearningDesign.COPY_TYPE_PREVIEW + " " + "and l.lessonStateId = "
@@ -89,6 +96,7 @@
     private final static String FIND_PREVIEW_LESSON_IDS = "SELECT lesson.lessonId FROM " + Lesson.class.getName()
 	    + " AS lesson WHERE lesson.learningDesign.copyTypeID = " + LearningDesign.COPY_TYPE_PREVIEW;
 
+
     /**
      * Retrieves the Lesson. Used in instances where it cannot be lazy loaded so it forces an initialize.
      *
@@ -260,6 +268,18 @@
     }
 
     /**
+     * Get the lesson and activity ids that apply to the tool activity associated with this tool content id. 
+     * Returns an array of two longs.
+     */
+    @Override
+    public Object[] getLessonActivityForActivity(long toolContentId) {
+	Query query = getSession().createQuery(LessonDAO.FIND_LESSON_ACTIVITY_BY_TOOL_CONTENT_ID);
+	query.setLong("toolContentId", toolContentId);
+	List list = query.list();
+	return list.size() > 0 ? (Object[]) list.get(0) : null;
+    }
+
+    /**
      * @see org.lamsfoundation.lams.lesson.dao.ILessonDAO#getLessonsByOrgAndUserWithCompletedFlag(Integer, Integer,
      *      boolean)
      */
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	(.../LogEvent.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	(.../LogEvent.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -50,17 +50,18 @@
     public static final int TYPE_LEARNER_LESSON_COMPLETE = 7;
     public static final int TYPE_LEARNER_LESSON_MARK_SUBMIT = 8;
     public static final int TYPE_ACTIVITY_EDIT = 9; // Audit Service
-    public static final int TYPE_USER_ORG_ADMIN = 10;
-    public static final int TYPE_LOGIN_AS  = 11;
-    public static final int TYPE_PASSWORD_CHANGE  = 12;
-    public static final int TYPE_ROLE_FAILURE = 13;
-    public static final int TYPE_ACCOUNT_LOCKED = 14;
-    public static final int TYPE_NOTIFICATION  = 15;
-    public static final int MARK_UPDATED = 16;  // Audit Service
-    public static final int MARK_RELEASED = 17; 
-    public static final int LEARNER_CONTENT_UPDATED = 18; // Audit Service
-    public static final int LEARNER_CONTENT_SHOW_HIDE = 19; // Audit Service
-    public static final int UNKNOWN = 20; // catch all for conversion
+    public static final int TYPE_FORCE_COMPLETE = 10; // Audit Service
+    public static final int TYPE_USER_ORG_ADMIN = 11;
+    public static final int TYPE_LOGIN_AS  = 12;
+    public static final int TYPE_PASSWORD_CHANGE  = 13;
+    public static final int TYPE_ROLE_FAILURE = 14;
+    public static final int TYPE_ACCOUNT_LOCKED = 15;
+    public static final int TYPE_NOTIFICATION  = 16;
+    public static final int TYPE_MARK_UPDATED = 17;  // Audit Service
+    public static final int TYPE_MARK_RELEASED = 18; 
+    public static final int TYPE_LEARNER_CONTENT_UPDATED = 19; // Audit Service
+    public static final int TYPE_LEARNER_CONTENT_SHOW_HIDE = 20; // Audit Service
+    public static final int TYPE_UNKNOWN = 21; // catch all for conversion
 
     /** *************************************************************** */
 
@@ -78,7 +79,7 @@
     private Date occurredDateTime;
 
     /**  */
-    private Long targetId;
+    private Integer targetUserId;
 
     /**  */
     private Long lessonId;
@@ -149,12 +150,12 @@
     /**
      *
      */
-    public Long getTargetId() {
-	return targetId;
+    public Integer getTargetUserId() {
+	return targetUserId;
     }
 
-    public void setTargetId(Long targetId) {
-	this.targetId = targetId;
+    public void setTargetUserId(Integer targetUserId) {
+	this.targetUserId = targetUserId;
     }
 
     /**
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java	(.../LogEventType.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEventType.java	(.../LogEventType.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -57,7 +57,7 @@
     }
     
     public String getAreaI18NKey() {
-	return "label."+area.toLowerCase().replace("_", ".");
+	return "label.area."+area.toLowerCase().replace("_", ".");
     }
 
 }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java	(.../ILogEventDAO.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/ILogEventDAO.java	(.../ILogEventDAO.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -76,7 +76,7 @@
     Date getOldestEventDate();
 
     /** Used for displaying paged lists of events */
-    List<LogEvent> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
+    List<Object[]> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
 	    Date endDate, String area, Integer typeId);
 
     int countEventsWithRestrictions(String searchString, Date startDate, Date endDate, String area, Integer typeId);
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	(.../LogEventDAO.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java	(.../LogEventDAO.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import org.hibernate.SQLQuery;
+import org.hibernate.type.StringType;
 import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
 import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.LogEventType;
@@ -101,10 +102,10 @@
     @Override
     @SuppressWarnings("unchecked")
     /**
-     * Will return List<[ForumUser, String], [ForumUser, String], ... , [ForumUser, String]>
-     * where the String is the notebook entry. No notebook entries needed? Will return "null" in their place.
+     * Will return List<[LogEvent, String], [LogEvent, String], ... , [LogEvent, String]>
+     * where the String is the lesson name. Lesson name may be null.
      */
-    public List<LogEvent> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
+    public List<Object[]> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
 	    Date endDate, String area, Integer typeId) {
 	String sortingOrder;
 	switch (sorting) {
@@ -121,7 +122,9 @@
 	// Basic select for the user records
 	StringBuilder queryText = new StringBuilder();
 
-	queryText.append("SELECT * FROM lams_log_event e ");
+	queryText.append(
+		"SELECT le.*, lesson.name lessonName FROM lams_log_event le LEFT JOIN lams_lesson lesson ON le.lesson_id = lesson.lesson_id");
+
 	addWhereClause(startDate, endDate, area, typeId, queryText);
 //	// If filtering by name add a name based where clause (LDEV-3779: must come before the Notebook JOIN statement)
 //	buildNameSearch(queryText, searchString);
@@ -131,6 +134,7 @@
 
 	SQLQuery query = getSession().createSQLQuery(queryText.toString());
 	query.addEntity("event", LogEvent.class);
+	query.addScalar("lessonName", StringType.INSTANCE);
 	addParameters(startDate, endDate, area, typeId, query);
 	query.setFirstResult(page * size).setMaxResults(size);
 	return query.list();
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java	(.../ILogEventService.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/ILogEventService.java	(.../ILogEventService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -20,7 +20,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.logevent.service;
 
 import java.util.Date;
@@ -35,7 +34,7 @@
  * @author Andrey Balan
  */
 public interface ILogEventService {
-    
+
     /** Constants used for sorting */
     static final int SORT_BY_DATE_ASC = 0;
     static final int SORT_BY_DATE_DESC = 1;
@@ -46,15 +45,17 @@
      * @param logEventTypeId
      * @param userId
      */
-    void logEvent(Integer logEventTypeId, Integer userId, Long learningDesignId, Long lessonId, Long activityId);
+    void logEvent(Integer logEventTypeId, Integer userId, Integer targetUserId, Long lessonId, Long activityId,
+	    String description, Date eventDate);
 
     /**
      * Records event of specified type in database.
      *
      * @param logEventTypeId
      * @param userId
      */
-    void logEvent(Integer logEventTypeId, Integer userId, Long learningDesignId, Long lessonId, Long activityId, String description);
+    void logEvent(Integer logEventTypeId, Integer userId, Integer targetUserId, Long lessonId, Long activityId,
+	    String description);
 
     /**
      * Returns event by the given id.
@@ -84,14 +85,30 @@
 
     /** Get the Log Event Types in a structured form */
     List<LogEventType> getEventTypes();
-     
+
     /** Get the date of the oldest event log entry. Handy for letting a user select a date range */
     Date getOldestEventDate();
-    
+
     /** Used for displaying paged lists of events */
-    List<LogEvent> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
+    List<Object[]> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
 	    Date endDate, String area, Integer typeId);
 
     int countEventsWithRestrictions(String searchString, Date startDate, Date endDate, String area, Integer typeId);
 
+    /* ***************************** Helper methods used by tools to keep the audit entries consistent *****************/
+    void logChangeLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId, String originalText,
+	    String newText);
+
+    void logMarkChange(Long learnerUserId, String learnerUserLogin, Long toolContentId, String originalMark,
+	    String newMark);
+
+    void logHideLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId, String hiddenItem);
+
+    void logShowLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId, String hiddenItem);
+
+    void logStartEditingActivityInMonitor(Long toolContentId);
+
+    void logFinishEditingActivityInMonitor(Long toolContentId);
+
+    void logCancelEditingActivityInMonitor(Long toolContentId);
 }
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	(.../LogEventService.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/service/LogEventService.java	(.../LogEventService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -20,18 +20,24 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.logevent.service;
 
 import java.util.Date;
 import java.util.List;
 
+import javax.servlet.http.HttpSession;
+
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.LogEventType;
 import org.lamsfoundation.lams.logevent.dao.ILogEventDAO;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
  * Class implements <code>ILogEventService</code>.
@@ -43,13 +49,24 @@
 
     private Logger log = Logger.getLogger(LogEventService.class);
 
+    // I18N keys used look up the messages in the helper methods
+    private final String AUDIT_CHANGE_I18N_KEY = "audit.change.entry";
+    private final String AUDIT_MARK_CHANGE_I18N_KEY = "audit.change.mark";
+    private final String AUDIT_HIDE_I18N_KEY = "audit.hide.entry";
+    private final String AUDIT_SHOW_I18N_KEY = "audit.show.entry";
+    private final String AUDIT_STARTED_EDITING_I18N_KEY = "audit.started.editing.activity";
+    private final String AUDIT_FINISHED_EDITING_I18N_KEY = "audit.finished.editing.activity";
+    private final String AUDIT_CANCELLED_EDITING_I18N_KEY = "audit.cancelled.editing.activity";
+
     /**
      * The only instance of this class, since it is a singleton.
      */
     private static LogEventService instance;
 
     private ILogEventDAO logEventDAO;
     private IUserManagementService userManagementService;
+    private MessageService messageService;
+    private ILessonDAO lessonDAO;
 
     /**
      * Default constructor. Should be called only once, since this class in a singleton.
@@ -71,24 +88,24 @@
     }
 
     @Override
-    public void logEvent(Integer logEventTypeId, Integer userId, Long targetUserId, Long lessonId,
-	    Long activityId) {
-	logEvent(logEventTypeId, userId, targetUserId, lessonId, activityId, null);
+    public void logEvent(Integer logEventTypeId, Integer userId, Integer targetUserId, Long lessonId, Long activityId,
+	    String description) {
+	logEvent(logEventTypeId, userId, targetUserId, lessonId, activityId, description, null);
     }
+
     @Override
-    public void logEvent(Integer logEventTypeId, Integer userId, Long targetUserId, Long lessonId,
-		    Long activityId, String description) {
+    public void logEvent(Integer logEventTypeId, Integer userId, Integer targetUserId, Long lessonId, Long activityId,
+	    String description, Date eventDate) {
 	User user = (userId != null) ? (User) userManagementService.findById(User.class, userId) : null;
-	if (user == null) {
-	    throw new RuntimeException("User can't be null");
-	}
 	LogEvent logEvent = new LogEvent();
 	logEvent.setLogEventTypeId(logEventTypeId);
 	logEvent.setUser(user);
-	logEvent.setTargetId(targetUserId);
+	logEvent.setTargetUserId(targetUserId);
 	logEvent.setLessonId(lessonId);
 	logEvent.setActivityId(activityId);
 	logEvent.setDescription(description);
+	if (eventDate != null)
+	    logEvent.setOccurredDateTime(eventDate);
 	logEventDAO.save(logEvent);
     }
 
@@ -111,23 +128,147 @@
     public List<LogEventType> getEventTypes() {
 	return logEventDAO.getEventTypes();
     }
-    
+
     @Override
     public Date getOldestEventDate() {
 	return logEventDAO.getOldestEventDate();
     }
 
     @Override
-    public List<LogEvent> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
+    public List<Object[]> getEventsForTablesorter(int page, int size, int sorting, String searchString, Date startDate,
 	    Date endDate, String area, Integer typeId) {
 	return logEventDAO.getEventsForTablesorter(page, size, sorting, searchString, startDate, endDate, area, typeId);
     }
-    
+
     @Override
-    public int countEventsWithRestrictions(String searchString, Date startDate, Date endDate, String area, Integer typeId) {
+    public int countEventsWithRestrictions(String searchString, Date startDate, Date endDate, String area,
+	    Integer typeId) {
 	return logEventDAO.countEventsWithRestrictions(searchString, startDate, endDate, area, typeId);
     }
-    
+
+    // ********************** Helper methods used by tools to keep the audit entries consistent  *****************
+    private Integer getCurrentUserId() {
+	HttpSession ss = SessionManager.getSession();
+	if (ss != null) {
+	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    if (user != null) {
+		return user.getUserID();
+	    }
+	}
+	return null;
+    }
+
+    private UserDTO getCurrentUser() {
+	HttpSession ss = SessionManager.getSession();
+	if (ss != null) {
+	    return (UserDTO) ss.getAttribute(AttributeNames.USER);
+	}
+	return null;
+    }
+
+    // can I replace module name with tool signature?
+    @Override
+    public void logChangeLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId,
+	    String originalText, String newText) {
+	String[] args = new String[4];
+	args[0] = learnerUserLogin + "(" + learnerUserId + ")";
+	args[1] = originalText;
+	args[2] = newText;
+	logLearnerChange(LogEvent.TYPE_LEARNER_CONTENT_UPDATED, learnerUserId, toolContentId, AUDIT_CHANGE_I18N_KEY,
+		args);
+    }
+
+    @Override
+    public void logMarkChange(Long learnerUserId, String learnerUserLogin, Long toolContentId, String originalMark,
+	    String newMark) {
+	String[] args = new String[4];
+	args[0] = learnerUserLogin + "(" + learnerUserId + ")";
+	args[1] = originalMark;
+	args[2] = newMark;
+	logLearnerChange(LogEvent.TYPE_MARK_UPDATED, learnerUserId, toolContentId, AUDIT_MARK_CHANGE_I18N_KEY, args);
+    }
+
+    @Override
+    public void logHideLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId,
+	    String hiddenItem) {
+	String[] args = new String[3];
+	args[0] = learnerUserLogin + "(" + learnerUserId + ")";
+	args[1] = hiddenItem;
+	logLearnerChange(LogEvent.TYPE_LEARNER_CONTENT_SHOW_HIDE, learnerUserId, toolContentId, AUDIT_HIDE_I18N_KEY,
+		args);
+    }
+
+    @Override
+    public void logShowLearnerContent(Long learnerUserId, String learnerUserLogin, Long toolContentId,
+	    String hiddenItem) {
+	String[] args = new String[3];
+	args[0] = learnerUserLogin + "(" + learnerUserId + ")";
+	args[1] = hiddenItem;
+	logLearnerChange(LogEvent.TYPE_LEARNER_CONTENT_SHOW_HIDE, learnerUserId, toolContentId, AUDIT_SHOW_I18N_KEY,
+		args);
+    }
+
+    private void logLearnerChange(int eventType, Long learnerUserId, Long toolContentId, String messageKey,
+	    String[] args) {
+	Long lessonId = null;
+	Long activityId = null;
+	String toolSignature = null;
+	if (toolContentId != null) {
+	    // ToolActivity toolActivity = 
+	    Object[] ids = lessonDAO.getLessonActivityForActivity(toolContentId);
+	    if (ids != null) {
+		lessonId = (Long) ids[0];
+		activityId = (Long) ids[1];
+		toolSignature = (String) ids[2];
+	    }
+	}
+
+	args[args.length - 1] = toolSignature;
+	logEvent(eventType, getCurrentUserId(), learnerUserId != null ? learnerUserId.intValue() : null, lessonId,
+		activityId, messageService.getMessage(messageKey, args));
+    }
+
+    @Override
+    public void logStartEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_STARTED_EDITING_I18N_KEY);
+    }
+
+    @Override
+    public void logFinishEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_FINISHED_EDITING_I18N_KEY);
+    }
+
+    @Override
+    public void logCancelEditingActivityInMonitor(Long toolContentId) {
+	logEditActivityInMonitor(toolContentId, AUDIT_CANCELLED_EDITING_I18N_KEY);
+    }
+
+    private void logEditActivityInMonitor(Long toolContentId, String messageKey) {
+
+	Number lessonId = null;
+	Number activityId = null;
+	String toolSignature = null;
+	if (toolContentId != null) {
+	    // ToolActivity toolActivity = 
+	    Object[] ids = lessonDAO.getLessonActivityForActivity(toolContentId);
+	    if (ids != null) {
+		lessonId = (Number) ids[0];
+		activityId = (Number) ids[1];
+		toolSignature = (String) ids[2];
+	    }
+	}
+
+	UserDTO user = getCurrentUser();
+	String userString = user != null
+		? new StringBuilder(user.getLogin()).append("(").append(user.getUserID()).append(")").toString()
+		: "";
+	String activityString = new StringBuilder(toolSignature).append(" (activityId:").append(activityId).append(")")
+		.toString();
+	String message = messageService.getMessage(messageKey, new String[] { userString, activityString });
+	logEvent(LogEvent.TYPE_ACTIVITY_EDIT, getCurrentUserId(), null, lessonId != null ? lessonId.longValue() : null,
+		activityId != null ? activityId.longValue() : null, message.toString());
+    }
+
     /**
      *
      * @param logEventDAO
@@ -146,4 +287,12 @@
 	this.userManagementService = userManagementService;
     }
 
+    public void setLessonDAO(ILessonDAO lessonDAO) {
+	this.lessonDAO = lessonDAO;
+    }
+
+    public void setMessageService(MessageService messageService) {
+	this.messageService = messageService;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java	(.../SecurityService.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java	(.../SecurityService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -30,10 +30,11 @@
 
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.Role;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * Contains methods for checking and logging user access to LAMS content. Should be used throughout the whole project.
@@ -43,14 +44,13 @@
 public class SecurityService implements ISecurityService {
     private static Logger log = Logger.getLogger(SecurityService.class);
 
-    private static final String SECURITY_MODULE_NAME = "security";
     private static final String[] GROUP_MONITOR_ROLES = new String[] { Role.GROUP_MANAGER, Role.MONITOR };
     private static final List<String> GROUP_SUPER_ROLES = Collections
 	    .unmodifiableList(Arrays.asList(Role.GROUP_ADMIN, Role.GROUP_MANAGER));
     private static final String[] EMPTY_STRING_ARRAY = new String[0];
 
     private ISecurityDAO securityDAO;
-    private IAuditService auditService;
+    private ILogEventService logEventService;
 
     @Override
     public boolean isLessonLearner(Long lessonId, Integer userId, String action, boolean escalate)
@@ -59,6 +59,7 @@
 	    String error = "Missing lesson ID when checking if user " + userId + " is learner and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -69,6 +70,7 @@
 	    String error = "Missing user ID when checking if is learner in lesson " + lessonId + " and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -81,7 +83,7 @@
 	    String error = "Could not find lesson " + lessonId + " when checking if user " + userId
 		    + " is learner and can \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -98,7 +100,7 @@
 	    String error = "User " + userId + " is not learner in lesson " + lessonId + " and can not \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -116,6 +118,7 @@
 	    String error = "Missing lesson ID when checking if user " + userId + " is monitor and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -126,6 +129,7 @@
 	    String error = "Missing user ID when checking if is monitor in lesson " + lessonId + " and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -138,7 +142,7 @@
 	    String error = "Could not find lesson " + lessonId + " when checking if user " + userId
 		    + " is monitor and can \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -157,7 +161,7 @@
 	    String error = "User " + userId + " is not monitor in lesson " + lessonId + " and can not \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -174,6 +178,7 @@
 	if (lessonId == null) {
 	    String error = "Missing lesson ID when checking if user " + userId + " is owner and can \"" + action + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -184,6 +189,7 @@
 	    String error = "Missing user ID when checking if is owner of lesson " + lessonId + " and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -196,7 +202,7 @@
 	    String error = "Could not find lesson " + lessonId + " when checking if user " + userId
 		    + " is owner and can \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -207,7 +213,7 @@
 	if (!lesson.getUser().getUserId().equals(userId)) {
 	    String error = "User " + userId + " is not owner of lesson " + lessonId + " and can not \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -225,7 +231,7 @@
 	    String error = "Missing lesson ID when checking if user " + userId + " is participant and can \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -236,6 +242,7 @@
 	    String error = "Missing user ID when checking if is participant in lesson " + lessonId + " and can \""
 		    + action + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -248,7 +255,7 @@
 	    String error = "Could not find lesson " + lessonId + " when checking if user " + userId
 		    + " is participant and can \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -268,7 +275,7 @@
 	    String error = "User " + userId + " is not participant in lesson " + lessonId + " and can not \"" + action
 		    + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, lessonId, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -284,13 +291,14 @@
 	if (userId == null) {
 	    String error = "Missing user ID when checking if is sysadmin and can \"" + action + "\"";
 	    SecurityService.log.error(error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, null, null, error);
 	    throw new SecurityException(error);
 	}
 
 	if (!securityDAO.isSysadmin(userId)) {
 	    String error = "User " + userId + " is not sysadmin and can not \"" + action + "\"";
 	    SecurityService.log.error(error);
-	    auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	    logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, null, null, error);
 	    if (escalate) {
 		throw new SecurityException(error);
 	    } else {
@@ -357,7 +365,7 @@
 	String error = "User " + userId + " does not have any of " + Arrays.toString(roles) + " roles in organisation "
 		+ orgId + " and can not \"" + action + "\"";
 	SecurityService.log.error(error);
-	auditService.log(SecurityService.SECURITY_MODULE_NAME, error);
+	logEventService.logEvent(LogEvent.TYPE_ROLE_FAILURE, userId, userId, null, null, error);
 	if (escalate) {
 	    throw new SecurityException(error);
 	} else {
@@ -369,7 +377,7 @@
 	this.securityDAO = securityDAO;
     }
 
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
+    public void setLogEventService(ILogEventService logEventService) {
+	this.logEventService = logEventService;
     }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -ra4fd7ba340a2beac7436660039f13b9c8708f172 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision a4fd7ba340a2beac7436660039f13b9c8708f172)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -384,9 +384,10 @@
      */
     Theme getDefaultTheme();
 
-    void auditPasswordChanged(User user, String moduleName);
+    void logPasswordChanged(User user, User modifiedBy);
 
-    void auditUserCreated(User user, String moduleName);
+    void logUserCreated(User user, User createdBy);
+    void logUserCreated(User user, UserDTO createdBy);
 
     Integer getCountUsers();
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
diff -u -rfebc5ec394566f98439ce776a0be320b34310b0a -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision febc5ec394566f98439ce776a0be320b34310b0a)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -163,7 +163,7 @@
 		user.setTutorialsDisabled(false);
 		user.setFirstLogin(true);
 		service.saveUser(user);
-		service.auditUserCreated(user, "common");
+		service.logUserCreated(user, (User)null);
 		return true;
 	    } else {
 		log.error("===> Login name from LDAP is empty - user not created.");
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r3e90dd984595eb1678e0768267949614f2e670a6 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 3e90dd984595eb1678e0768267949614f2e670a6)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -48,6 +48,8 @@
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.themes.Theme;
 import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
@@ -73,7 +75,6 @@
 import org.lamsfoundation.lams.util.HashUtil;
 import org.lamsfoundation.lams.util.LanguageUtil;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.imgscalr.ResizePictureUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -113,7 +114,7 @@
 
     protected MessageService messageService;
 
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
 
     private IToolContentHandler centralToolContentHandler;
 
@@ -888,23 +889,32 @@
     }
 
     @Override
-    public void auditPasswordChanged(User user, String moduleName) {
+    public void logPasswordChanged(User user, User modifiedBy) {
 	String[] args = new String[1];
 	args[0] = user.getLogin() + "(" + user.getUserId() + ")";
 	String message = messageService.getMessage("audit.user.password.change", args);
-	getAuditService().log(moduleName, message);
+	getLogEventService().logEvent(LogEvent.TYPE_PASSWORD_CHANGE, modifiedBy != null ? modifiedBy.getUserId() : null , user.getUserId(), null, null, message);
     }
 
     @Override
-    public void auditUserCreated(User user, String moduleName) {
+    public void logUserCreated(User user, User createdBy) {
 	String[] args = new String[2];
 	args[0] = user.getLogin() + "(" + user.getUserId() + ")";
 	args[1] = user.getFullName();
 	String message = messageService.getMessage("audit.user.create", args);
-	getAuditService().log(moduleName, message);
+	getLogEventService().logEvent(LogEvent.TYPE_USER_ORG_ADMIN, createdBy != null ? createdBy.getUserId() : null, user.getUserId(), null, null, message);
     }
 
     @Override
+    public void logUserCreated(User user, UserDTO createdBy) {
+	String[] args = new String[2];
+	args[0] = user.getLogin() + "(" + user.getUserId() + ")";
+	args[1] = user.getFullName();
+	String message = messageService.getMessage("audit.user.create", args);
+	getLogEventService().logEvent(LogEvent.TYPE_USER_ORG_ADMIN, createdBy != null ? createdBy.getUserID() : null, user.getUserId(), null, null, message);
+    }
+
+    @Override
     public Integer getCountUsers() {
 	String query = "SELECT count(u) FROM User u";
 	return getFindIntegerResult(query);
@@ -1185,13 +1195,13 @@
 	this.favoriteOrganisationDAO = favoriteOrganisationDAO;
     }
 
-    private IAuditService getAuditService() {
-	if (UserManagementService.auditService == null) {
+    private ILogEventService getLogEventService() {
+	if (UserManagementService.logEventService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
 		    .getWebApplicationContext(SessionManager.getServletContext());
-	    UserManagementService.auditService = (IAuditService) ctx.getBean("auditService");
+	    UserManagementService.logEventService = (ILogEventService) ctx.getBean("logEventService");
 	}
-	return UserManagementService.auditService;
+	return UserManagementService.logEventService;
     }
 
     public void setCentralToolContentHandler(IToolContentHandler centralToolContentHandler) {
Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java
===================================================================
diff -u -r5f82321c5864250c612773630ff209a45e71a3f1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java	(.../AuditService.java)	(revision 5f82321c5864250c612773630ff209a45e71a3f1)
+++ lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java	(.../AuditService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -101,16 +101,17 @@
 	return userDTO.getLogin() + "(" + userDTO.getUserID() + "): ";
     }
 
+    // used by submit - keep till that is updated
     @Override
     public void log(String moduleName, String message) {
-	logEventService.logEvent(LogEvent.UNKNOWN,  getUserID(), null, null, null, getUserString() + moduleName + ": " + message);
+	logEventService.logEvent(LogEvent.TYPE_UNKNOWN,  getUserID(), null, null, null, getUserString() + moduleName + ": " + message);
     }
-
-    @Override
-    public void log(UserDTO userDTO, String moduleName, String message) {
-	logEventService.logEvent(LogEvent.UNKNOWN,  getUserID(), null, null, null, getUserString(userDTO) + moduleName + ": " + message);
-    }
-
+//
+//    @Override
+//    public void log(UserDTO userDTO, String moduleName, String message) {
+//	logEventService.logEvent(LogEvent.UNKNOWN,  getUserID(), null, null, null, getUserString(userDTO) + moduleName + ": " + message);
+//    }
+//
     
     @SuppressWarnings("unchecked")
     private void logEvent(Integer logEventTypeId, Long targetUserId, Long toolContentId, String description) {
@@ -129,7 +130,7 @@
 	    }
 	    // lookup lessonId from activityId
 	}
-	logEventService.logEvent(logEventTypeId, userId, targetUserId, lessonId, activityId, description);
+	logEventService.logEvent(logEventTypeId, userId, targetUserId != null ? targetUserId.intValue() : null, lessonId, activityId, description);
     }
 
     @Override
@@ -140,7 +141,7 @@
 	args[1] = originalText;
 	args[2] = newText;
 	String message = messageService.getMessage(AUDIT_CHANGE_I18N_KEY, args);
-	logEvent(LogEvent.LEARNER_CONTENT_UPDATED, originalUserId, null, message.toString());
+	logEvent(LogEvent.TYPE_LEARNER_CONTENT_UPDATED, originalUserId, null, message.toString());
     }
 
     @Override
@@ -151,7 +152,7 @@
 	args[1] = originalMark;
 	args[2] = newMark;
 	StringBuilder message = new StringBuilder(moduleName).append(messageService.getMessage(AUDIT_MARK_CHANGE_I18N_KEY, args));
-	logEvent(LogEvent.MARK_UPDATED, originalUserId, null, message.toString());
+	logEvent(LogEvent.TYPE_MARK_UPDATED, originalUserId, null, message.toString());
     }
     
     @Override
@@ -160,7 +161,7 @@
 	args[0] = originalUserLogin + "(" + originalUserId + ")";
 	args[1] = hiddenItem;
 	String message = messageService.getMessage(AUDIT_HIDE_I18N_KEY, args);
-	logEvent(LogEvent.LEARNER_CONTENT_SHOW_HIDE, originalUserId, null, message.toString());
+	logEvent(LogEvent.TYPE_LEARNER_CONTENT_SHOW_HIDE, originalUserId, null, message.toString());
     }
 
     @Override
@@ -169,7 +170,7 @@
 	args[0] = originalUserLogin + "(" + originalUserId + ")";
 	args[1] = hiddenItem;
 	String message = messageService.getMessage(AUDIT_SHOW_I18N_KEY, args);
-	logEvent(LogEvent.LEARNER_CONTENT_SHOW_HIDE, originalUserId, null, message.toString());
+	logEvent(LogEvent.TYPE_LEARNER_CONTENT_SHOW_HIDE, originalUserId, null, message.toString());
    }
     
     @Override
Index: lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java	(.../IAuditService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java	(.../IAuditService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -24,8 +24,6 @@
 
 package org.lamsfoundation.lams.util.audit;
 
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-
 /** Public interface for a service that writes audit records */
 public interface IAuditService {
 
@@ -39,15 +37,15 @@
      */
     void log(String moduleName, String message);
 
-    /**
-     * Same as above, but logs message using given userDTO instead of current session DTO. Useful when importing users
-     * in a separate thread which isn't linked to main session.
-     *
-     * @param userDTO
-     * @param moduleName
-     * @param message
-     */
-    void log(UserDTO userDTO, String moduleName, String message);
+//    /**
+//     * Same as above, but logs message using given userDTO instead of current session DTO. Useful when importing users
+//     * in a separate thread which isn't linked to main session.
+//     *
+//     * @param userDTO
+//     * @param moduleName
+//     * @param message
+//     */
+//    void log(UserDTO userDTO, String moduleName, String message);
 
     /**
      * Log a data change. The username, date, moduleName and change details are recorded in the audit log.
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
diff -u -r8daec7e047f7ea8404c6f16218b63a8e855a15b2 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision 8daec7e047f7ea8404c6f16218b63a8e855a15b2)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	(.../gradebookApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -23,7 +23,7 @@
 		<property name="baseDAO"><ref bean="baseDAO"/></property>
 		<property name="activityDAO"><ref bean="activityDAO"/></property>
 		<property name="messageService"><ref bean="gradebookMessageService"/></property>
-		<property name="auditService"><ref bean="auditService"/></property>
+		<property name="logEventService"><ref bean="logEventService"/></property>
 	</bean>
 	
 	<bean id="gradebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" >
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r84fdcb946a3188efb2c259c4d264d95d46803a06 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 84fdcb946a3188efb2c259c4d264d95d46803a06)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -49,7 +49,6 @@
 import org.lamsfoundation.lams.gradebook.dto.GBUserGridRowDTO;
 import org.lamsfoundation.lams.gradebook.dto.GradebookGridRowDTO;
 import org.lamsfoundation.lams.gradebook.util.GBGridView;
-import org.lamsfoundation.lams.gradebook.util.GradebookConstants;
 import org.lamsfoundation.lams.gradebook.util.GradebookUtil;
 import org.lamsfoundation.lams.gradebook.util.LessonComparator;
 import org.lamsfoundation.lams.gradebook.util.UserComparator;
@@ -73,6 +72,8 @@
 import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.dao.ILessonDAO;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputValue;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -90,7 +91,6 @@
 import org.lamsfoundation.lams.util.ExcelCell;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -123,7 +123,7 @@
     private IBaseDAO baseDAO;
     private IActivityDAO activityDAO;
     private MessageService messageService;
-    private IAuditService auditService;
+    private ILogEventService logEventService;
     private static ICoreLearnerService learnerService;
 
     @Override
@@ -511,7 +511,7 @@
 	    String[] args = new String[] { learner.getLogin() + "(" + learner.getUserId() + ")",
 		    lesson.getLessonId().toString(), oldMark, mark.toString() };
 	    String message = messageService.getMessage("audit.lesson.change.mark", args);
-	    auditService.log(monitorUser, GradebookConstants.MODULE_NAME, message);
+	    logEventService.logEvent(LogEvent.TYPE_MARK_UPDATED, monitorUser.getUserID(), learner.getUserId(), lesson.getLessonId(), null, message);
 	}
     }
 
@@ -717,7 +717,8 @@
 			activity.getActivityId().toString(), lesson.getLessonId().toString(), oldMark.toString(),
 			markStr };
 		String message = messageService.getMessage("audit.activity.change.mark", args);
-		auditService.log(monitorUser, GradebookConstants.MODULE_NAME, message);
+		logEventService.logEvent(LogEvent.TYPE_MARK_UPDATED, monitorUser.getUserID(), learner.getUserId(),
+			lesson.getLessonId(), activity.getActivityId(), message);
 	    }
 	}
     }
@@ -764,7 +765,7 @@
 	UserDTO monitor = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 	String messageKey = (isMarksReleased) ? "audit.marks.released.off" : "audit.marks.released.on";
 	String message = messageService.getMessage(messageKey, new String[] { lessonId.toString() });
-	auditService.log(monitor, GradebookConstants.MODULE_NAME, message);
+	logEventService.logEvent(LogEvent.TYPE_MARK_RELEASED, monitor.getUserID(), null, lessonId, null, message);
     }
 
     @Override
@@ -2274,8 +2275,8 @@
 
     // Getter and setter methods -----------------------------------------------
 
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
+    public void setLogEventService(ILogEventService logEventService) {
+	this.logEventService = logEventService;
     }
 
     public ILamsCoreToolService getToolService() {
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java
===================================================================
diff -u -r0aad94a28574176ae783da37b50e4108c0882e90 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java	(.../RecalculateTotalMarksForLessonServlet.java)	(revision 0aad94a28574176ae783da37b50e4108c0882e90)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java	(.../RecalculateTotalMarksForLessonServlet.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -35,8 +35,11 @@
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -52,14 +55,14 @@
 
     private static Logger log = Logger.getLogger(RecalculateTotalMarksForLessonServlet.class);
 
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
     private static ILessonService lessonService;
     private static IGradebookService gradebookService;
 
     @Override
     public void init() throws ServletException {
 	WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
-	auditService = (IAuditService) ctx.getBean("auditService");
+	logEventService = (ILogEventService) ctx.getBean("logEventService");
 	lessonService = (ILessonService) ctx.getBean("lessonService");
 	gradebookService = (IGradebookService) ctx.getBean("gradebookService");
     }
@@ -88,8 +91,10 @@
 	    return;
 	}
 
+	// audit log changed gradebook mark
 	String msg = "Total marks have been successfully recalculated for lessonId " + lessonId;
-	auditService.log("RecalculateTotalMarksForLessonServlet", msg);
+	UserDTO monitorUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
+	logEventService.logEvent(LogEvent.TYPE_MARK_UPDATED, monitorUser.getUserID(), null, lessonId, null, msg);
 	out.println(msg);
 	out.close();
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
diff -u -r453898dc3e1802c2280217b914be130fd19fe4d5 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 453898dc3e1802c2280217b914be130fd19fe4d5)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -223,8 +223,8 @@
 	}
 
 	logEventService.logEvent(LogEvent.TYPE_LEARNER_ACTIVITY_START, progress.getUser().getUserId(),
-		activity.getLearningDesign().getLearningDesignId(), progress.getLesson().getLessonId(),
-		activity.getActivityId());
+		progress.getUser().getUserId(), progress.getLesson().getLessonId(),
+		activity.getActivityId(), null);
 
 	// update activity
 	activityDAO.insertOrUpdate(activity);
@@ -372,8 +372,9 @@
 	learnerProgress.setLessonComplete(completionStatus);
 
 	// log learner has completed the current lesson event
-	logEventService.logEvent(LogEvent.TYPE_LEARNER_LESSON_COMPLETE, learnerProgress.getUser().getUserId(), null,
-		learnerProgress.getLesson().getLessonId(), null);
+	logEventService.logEvent(LogEvent.TYPE_LEARNER_LESSON_COMPLETE, learnerProgress.getUser().getUserId(), 
+		learnerProgress.getUser().getUserId(),
+		learnerProgress.getLesson().getLessonId(), null, null);
 
 	return learnerProgress;
     }
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -r36a3c1beea2e7fbd8109512d89e6bfa39d965c51 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 36a3c1beea2e7fbd8109512d89e6bfa39d965c51)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -646,8 +646,8 @@
 	}
 	// }
 	logEventService.logEvent(LogEvent.TYPE_LEARNER_ACTIVITY_FINISH, learnerId,
-		activity.getLearningDesign().getLearningDesignId(), progress.getLesson().getLessonId(),
-		activity.getActivityId());
+		null, progress.getLesson().getLessonId(),
+		activity.getActivityId(), "ADD COMMENT HERE");
     }
 
     @Override
@@ -758,8 +758,8 @@
 	    }
 	}
     }
-
-    private boolean forceGrouping(Lesson lesson, Grouping grouping, Group group, User learner) {
+    
+     private boolean forceGrouping(Lesson lesson, Grouping grouping, Group group, User learner) {
 	boolean groupingDone = false;
 	if (lesson.isPreviewLesson()) {
 	    ArrayList<User> learnerList = new ArrayList<User>();
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
===================================================================
diff -u -r34815c1edfbbd510266420e5cfaf4baf290e9a1e -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java	(.../LogLessonMarkPushedToIntegrationsServlet.java)	(revision 34815c1edfbbd510266420e5cfaf4baf290e9a1e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java	(.../LogLessonMarkPushedToIntegrationsServlet.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -70,7 +70,7 @@
 	}
 
 	//log mark has been successfullly pushed to the integrated server
-	logEventService.logEvent(LogEvent.TYPE_LEARNER_LESSON_MARK_SUBMIT, user.getUserID(), null, lessonID, null);
+	logEventService.logEvent(LogEvent.TYPE_LEARNER_LESSON_MARK_SUBMIT, user.getUserID(), null, lessonID, null, "ADD COMMENT HERE");
 
 	response.setContentType("text/html");
 	PrintWriter out = response.getWriter();
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
===================================================================
diff -u -r34815c1edfbbd510266420e5cfaf4baf290e9a1e -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java	(.../RepopulateProgressMarksServlet.java)	(revision 34815c1edfbbd510266420e5cfaf4baf290e9a1e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java	(.../RepopulateProgressMarksServlet.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -26,8 +26,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.ServletException;
@@ -37,34 +35,23 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
-import org.hibernate.SessionFactory;
-import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.learningdesign.ComplexActivity;
 import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.learningdesign.LearningDesignProcessor;
 import org.lamsfoundation.lams.learningdesign.SimpleActivity;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
 import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
 import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException;
-import org.lamsfoundation.lams.lesson.CompletedActivityProgress;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
-import org.lamsfoundation.lams.lesson.dao.ILearnerProgressDAO;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
-import org.lamsfoundation.lams.tool.Tool;
-import org.lamsfoundation.lams.tool.ToolCompletionStatus;
-import org.lamsfoundation.lams.tool.ToolSession;
-import org.lamsfoundation.lams.tool.service.ILamsCoreToolService;
-import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.orm.hibernate4.SessionHolder;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -73,14 +60,14 @@
 
     private static Logger log = Logger.getLogger(RepopulateProgressMarksServlet.class);
 
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
     private static ILessonService lessonService;
     private static ICoreLearnerService learnerService;
 
     @Override
     public void init() throws ServletException {
 	WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext());
-	RepopulateProgressMarksServlet.auditService = (IAuditService) ctx.getBean("auditService");
+	RepopulateProgressMarksServlet.logEventService = (ILogEventService) ctx.getBean("logEventService");
 	RepopulateProgressMarksServlet.lessonService = (ILessonService) ctx.getBean("lessonService");
 	RepopulateProgressMarksServlet.learnerService = (ICoreLearnerService) ctx.getBean("learnerService");
     }
@@ -95,9 +82,10 @@
 	UserDTO userDTO = null;
 
 	PrintWriter out = response.getWriter();
+	Long lessonId = null;
 	try {
 
-	    Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
+	    lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
 	    Integer restrictToLearnerId = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, true);
 	    Boolean gradebookAll = WebUtil.readBooleanParam(request, "gradebookAll", false);
 	    HttpSession ss = SessionManager.getSession();
@@ -155,7 +143,7 @@
 	} else {
 	    msg =  new StringBuilder(header).append("Successful run, no errors\n").append(auditLogBuilder.toString()).toString();
 	}
-	auditService.log(userDTO, "RepopulateProgressMarksServlet",msg);
+	logEventService.logEvent(LogEvent.TYPE_MARK_UPDATED, userDTO != null ? userDTO.getUserID() : null, null, lessonId, null, msg);
 	out.println(msg);
 	return;
     }
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
===================================================================
diff -u -r716e4f9721d3856e118a23a8f852154e5775cac4 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision 716e4f9721d3856e118a23a8f852154e5775cac4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(.../monitoringApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -43,7 +43,6 @@
 		<property name="eventDAO"><ref bean="eventDAO"/></property>
 		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>			
 		<property name="learnerService"><ref bean="learnerService"/></property>			
-		<property name="auditService"><ref bean="auditService"/></property>
 		<property name="logEventService"><ref bean="logEventService"/></property>				
 		<property name="lessonService"><ref bean="lessonService"/></property>			
 		<property name="userManagementService"><ref bean="userManagementService"/></property>			
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(.../MonitoringService.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -114,7 +114,6 @@
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
-import org.lamsfoundation.lams.util.audit.AuditService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.quartz.JobBuilder;
@@ -190,8 +189,6 @@
 
     private MessageService messageService;
 
-    private AuditService auditService;
-
     private ILogEventService logEventService;
 
     /** Message keys */
@@ -350,10 +347,6 @@
 	this.scheduler = scheduler;
     }
 
-    public void setAuditService(AuditService auditService) {
-	this.auditService = auditService;
-    }
-
     public void setLogEventService(ILogEventService logEventService) {
 	this.logEventService = logEventService;
     }
@@ -403,8 +396,9 @@
 
 	Long initializedLearningDesignId = initializedLesson.getLearningDesign().getLearningDesignId();
 	auditLogLessonStateChange(initializedLesson, null, initializedLesson.getLessonStateId());
-	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CREATE, userID, initializedLearningDesignId,
-		initializedLesson.getLessonId(), null);
+	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CREATE, userID, null,
+		initializedLesson.getLessonId(), null,
+		"Lesson created using learning design id "+initializedLearningDesignId);
 
 	return initializedLesson;
     }
@@ -745,7 +739,9 @@
 	    MonitoringService.log.debug("=============Lesson " + lessonId + " started===============");
 	}
 	auditLogLessonStateChange(requestedLesson, null, requestedLesson.getLessonStateId());
-	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_START, userId, null, lessonId, null);
+	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_START, userId, null,
+		lessonId, null,
+		"Lesson started");
     }
 
     @Override
@@ -988,7 +984,8 @@
 	requestedLesson.setLessonStateId(status);
 	lessonDAO.updateLesson(requestedLesson);
 	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CHANGE_STATE, requestedLesson.getUser().getUserId(), null,
-		requestedLesson.getLessonId(), null);
+		requestedLesson.getLessonId(), null,
+		"Lesson state changed");
     }
 
     private void auditLogLessonStateChange(Lesson lesson, Integer previousStatus, Integer newStatus) {
@@ -1074,7 +1071,8 @@
 
 	auditLogLessonStateChange(requestedLesson, currentStatus, newStatus);
 	logEventService.logEvent(LogEvent.TYPE_TEACHER_LESSON_CHANGE_STATE, requestedLesson.getUser().getUserId(), null,
-		requestedLesson.getLessonId(), null);
+		requestedLesson.getLessonId(), null,
+		"Lesson state reverted");
     }
 
     @Override
@@ -2826,7 +2824,9 @@
      */
     private void writeAuditLog(String messageKey, Object[] args) {
 	String message = messageService.getMessage(messageKey, args);
-	auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, message);
+	// TODO refactor!
+	logEventService.logEvent(LogEvent.TYPE_UNKNOWN, null, null, null, null, message);
+//	auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, message);
     }
 
     /**
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
===================================================================
diff -u -r78b448706a4b92d425c6d68add1c40d82759a6c7 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision 78b448706a4b92d425c6d68add1c40d82759a6c7)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java	(.../EmailNotificationsAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -55,6 +55,8 @@
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.util.LessonComparator;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.monitoring.MonitoringConstants;
 import org.lamsfoundation.lams.monitoring.dto.EmailScheduleMessageJobDTO;
 import org.lamsfoundation.lams.monitoring.quartz.job.EmailScheduleMessageJob;
@@ -70,7 +72,6 @@
 import org.lamsfoundation.lams.util.ExcelUtil;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -106,7 +107,7 @@
 
     private static IEventNotificationService eventNotificationService;
     private static IUserManagementService userManagementService;
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
     private static ISecurityService securityService;
 
     // ---------------------------------------------------------------------
@@ -129,8 +130,9 @@
 	ICoreLearnerService learnerService = MonitoringServiceProxy.getLearnerService(getServlet().getServletContext());
 	Lesson lesson = learnerService.getLesson(lessonId);
 	if (!lesson.getEnableLessonNotifications()) {
-	    getAuditService().log(MonitoringConstants.MONITORING_MODULE_NAME,
-		    "Notifications are disabled in lesson " + lessonId);
+	    getLogEventService().logEvent(LogEvent.TYPE_NOTIFICATION, getCurrentUser().getUserID(), null,
+		    lessonId, null,
+		    "Attempted to send notification when notifications are disabled in lesson " + lessonId);
 	    response.sendError(HttpServletResponse.SC_BAD_REQUEST, "Notifications are disabled in the lesson");
 	    return null;
 	}
@@ -389,7 +391,8 @@
 
 			JobDetail jobDetail = scheduler.getJobDetail(trigger.getJobKey());
 			JobDataMap jobDataMap = jobDetail.getJobDataMap();
-			getAuditService().log(MonitoringConstants.MONITORING_MODULE_NAME,
+			getLogEventService().logEvent(LogEvent.TYPE_NOTIFICATION,
+				userId, null, lessonId, null,
 				"Deleting unsent scheduled notification " + jobKey + " "
 					+ jobDataMap.getString("emailBody"));
 
@@ -545,7 +548,8 @@
 	}
 
 	//audit log
-	getAuditService().log(MonitoringConstants.MONITORING_MODULE_NAME,
+	getLogEventService().logEvent(LogEvent.TYPE_NOTIFICATION, getCurrentUser().getUserID(), null,
+		null, null, 
 		"User " + getCurrentUser().getLogin() + " set a notification " + emailClauseStr + " " + scheduleDateStr
 			+ " with the following notice:  " + emailBody);
 
@@ -700,13 +704,13 @@
 	return userManagementService;
     }
 
-    private IAuditService getAuditService() {
-	if (auditService == null) {
+    private ILogEventService getLogEventService() {
+	if (logEventService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
 		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    auditService = (IAuditService) ctx.getBean("auditService");
+	    logEventService = (ILogEventService) ctx.getBean("logEventService");
 	}
-	return auditService;
+	return logEventService;
     }
 
     private ISecurityService getSecurityService() {
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
diff -u -rfe122f9f7ac40f3a3696a7c69043fc34df7994d4 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision fe122f9f7ac40f3a3696a7c69043fc34df7994d4)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(.../MonitoringAction.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -74,6 +74,8 @@
 import org.lamsfoundation.lams.lesson.Lesson;
 import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.logevent.LogEvent;
+import org.lamsfoundation.lams.logevent.service.ILogEventService;
 import org.lamsfoundation.lams.monitoring.MonitoringConstants;
 import org.lamsfoundation.lams.monitoring.dto.ContributeActivityDTO;
 import org.lamsfoundation.lams.monitoring.service.IMonitoringService;
@@ -92,7 +94,6 @@
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.ValidationUtil;
 import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -126,7 +127,7 @@
     private static final int LATEST_LEARNER_PROGRESS_ACTIVITY_DISPLAY_LIMIT = 7;
     private static final int USER_PAGE_SIZE = 10;
 
-    private static IAuditService auditService;
+    private static ILogEventService logEventService;
 
     private static ILessonService lessonService;
 
@@ -558,7 +559,7 @@
      */
     public ActionForward forceComplete(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws IOException, ServletException, JSONException {
-	getAuditService();
+
 	// get parameters
 	Long activityId = null;
 	String actId = request.getParameter(AttributeNames.PARAM_ACTIVITY_ID);
@@ -606,7 +607,8 @@
 	String messageKey = (activityId == null) ? "audit.force.complete.end.lesson" : "audit.force.complete";
 	Object[] args = new Object[] { learnerIDs, activityId, lessonId };
 	String auditMessage = getMonitoringService().getMessageService().getMessage(messageKey, args);
-	MonitoringAction.auditService.log(MonitoringConstants.MONITORING_MODULE_NAME, auditMessage + " " + message);
+	getLogEventService().logEvent(LogEvent.TYPE_FORCE_COMPLETE, requesterId, null, lessonId, null,
+		auditMessage + " " + message);
 
 	PrintWriter writer = response.getWriter();
 	writer.println(message);
@@ -1398,18 +1400,13 @@
 	return null;
     }
 
-    /**
-     * Get AuditService bean.
-     *
-     * @return
-     */
-    private IAuditService getAuditService() {
-	if (MonitoringAction.auditService == null) {
+    private ILogEventService getLogEventService() {
+	if (MonitoringAction.logEventService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
 		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    MonitoringAction.auditService = (IAuditService) ctx.getBean("auditService");
+	    MonitoringAction.logEventService = (ILogEventService) ctx.getBean("logEventService");
 	}
-	return MonitoringAction.auditService;
+	return MonitoringAction.logEventService;
     }
 
     private ILessonService getLessonService() {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -86,8 +86,8 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
+   		<property name="logEventService">
+   			<ref bean="logEventService"/>
    		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml	(.../chatApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -35,7 +35,7 @@
 				<property name="chatDAO"><ref bean="chatDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
+				<property name="logEventService"><ref bean="logEventService"/></property>		
  				<property name="chatToolContentHandler"><ref bean="chatToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
===================================================================
diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml	(.../dokumaranApplicationContext.xml)	(revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml	(.../dokumaranApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -65,8 +65,8 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
+   		<property name="logEventService">
+   			<ref bean="logEventService"/>
    		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -rd71c8a085fb0ea3c341f2cf46df958c356d88ec7 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision d71c8a085fb0ea3c341f2cf46df958c356d88ec7)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -127,8 +127,8 @@
 		<property name="exportContentService">
 			<ref bean="exportToolContentService" />
 		</property>
-		<property name="auditService">
-			<ref bean="auditService" />
+		<property name="logEventService">
+			<ref bean="logEventService" />
 		</property>
 		<property name="messageService">
 			<ref bean="forumMessageService" />
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml
===================================================================
diff -u -r2228652cfb59ec7c0fcbb1914a94f65d22815911 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision 2228652cfb59ec7c0fcbb1914a94f65d22815911)
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml	(.../imageGalleryApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -93,8 +93,8 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
+   		<property name="logEventService">
+   			<ref bean="logEventService"/>
    		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml	(.../commonCartridgeApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -83,8 +83,8 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
+   		<property name="logEventService">
+   			<ref bean="logEventService"/>
    		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml	(.../kalturaApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -38,7 +38,7 @@
 				<property name="kalturaRatingDao"><ref bean="kalturaRatingDao"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
+				<property name="logEventService"><ref bean="logEventService"/></property>		
  				<property name="kalturaToolContentHandler"><ref bean="kalturaToolContentHandler"/></property>
  				<property name="userManagementService"><ref bean="userManagementService"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r68a00ed36298398bdd7646b440a122d373bd75a1 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 68a00ed36298398bdd7646b440a122d373bd75a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -80,7 +80,7 @@
 					<property name="toolService"><ref bean="lamsToolService"/></property>
 			 		<property name="learnerService"><ref bean="learnerService"/></property>		
 					<property name="mcToolContentHandler"><ref bean="mcToolContentHandler"/></property>		
-					<property name="auditService"><ref bean="auditService"/></property>					
+					<property name="logEventService"><ref bean="logEventService"/></property>					
 					<property name="exportContentService"><ref bean="exportToolContentService"/></property>
 					<property name="gradebookService"><ref bean="gradebookService" /></property>
 			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>										
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -80,7 +80,7 @@
 					<property name="qaWizardDAO"><ref bean="qaWizardDAO"/></property>								
 					<property name="toolService"><ref bean="lamsToolService"/></property>
 					<property name="learnerService"><ref bean="learnerService"/></property>			
-					<property name="auditService"><ref bean="auditService"/></property>
+					<property name="logEventService"><ref bean="logEventService"/></property>
 					<property name="qaOutputFactory"><ref bean="qaOutputFactory"/></property>
 					<property name="qaToolContentHandler"><ref bean="qaToolContentHandler"/></property>								
 					<property name="exportContentService"><ref bean="exportToolContentService"/></property>											
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
===================================================================
diff -u -r942b2a5bf6dac160bf9e00bac22e6232ae65ef98 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision 942b2a5bf6dac160bf9e00bac22e6232ae65ef98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml	(.../rsrcApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -79,8 +79,8 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
+   		<property name="logEventService">
+   			<ref bean="logEventService"/>
    		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml	(.../mindmapApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -39,7 +39,7 @@
 				<property name="mindmapDAO"><ref bean="mindmapDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
+				<property name="logEventService"><ref bean="logEventService"/></property>		
  				<property name="mindmapToolContentHandler"><ref bean="mindmapToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
===================================================================
diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision 8e090b3ddf269cdffececa4bc55a9333da5b0858)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml	(.../notebookApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -33,7 +33,7 @@
 				<property name="notebookDAO"><ref bean="notebookDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
+				<property name="logEventService"><ref bean="logEventService"/></property>		
  				<property name="notebookToolContentHandler"><ref bean="notebookToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml
===================================================================
diff -u -ra6641bf9262a01d07740a517643f8fe187ec5b1f -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml	(.../pixlrApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -35,7 +35,7 @@
 				<property name="pixlrDAO"><ref bean="pixlrDAO"/></property>
 				<property name="toolService"><ref bean="lamsToolService"/></property>
 				<property name="learnerService"><ref bean="learnerService"/></property>	
-				<property name="auditService"><ref bean="auditService"/></property>		
+				<property name="logEventService"><ref bean="logEventService"/></property>		
  				<property name="pixlrToolContentHandler"><ref bean="pixlrToolContentHandler"/></property>
 		   		<property name="exportContentService"><ref bean="exportToolContentService"/></property> 				
 		   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java
===================================================================
diff -u -r58de3acfcde3052a939146df7d0172599e56633a -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java	(.../EmailAnalysisBuilder.java)	(revision 58de3acfcde3052a939146df7d0172599e56633a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/util/EmailAnalysisBuilder.java	(.../EmailAnalysisBuilder.java)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -364,7 +364,7 @@
 	    if (criteriaData != null) {
 		String selfRating = roundTo2Places(criteriaData.selfRating);
 		String peerRatingExcSelf = roundTo2Places(criteriaData.peerRatingExcSelf);
-		htmlText.append("<tr><td rowspan=\"2\" style=\"width:25%;").append(evenRow ? zebraEvenRow : zebraOddRow)
+		htmlText.append("<tr><td rowspan=\"3\" style=\"width:25%;").append(evenRow ? zebraEvenRow : zebraOddRow)
 			.append("\"><span style=\"").append(bold).append("\">").append(criteria.getTitle())
 			.append("</span></td><td style=\"width:20%;").append(evenRow ? zebraEvenRow : zebraOddRow)
 			.append("\"><span style=\"").append(bold).append("\">").append(selfRatingString)
@@ -391,6 +391,10 @@
 			    .append("</span></td>");
 		    spaDone = true;
 		}
+		htmlText.append("</tr>\n<tr><td style=\"width:20%;").append(evenRow ? zebraEvenRow : zebraOddRow)
+			.append("\"><span style=\"").append(bold).append("\">").append("Self & Peers' Rating")
+			.append("</span></td><td style=\"").append(evenRow ? zebraEvenRow : zebraOddRow).append("\">")
+			.append(roundTo2Places(criteriaData.peerRatingIncSelf)).append("</td>");
 		htmlText.append("</tr>\n");
 		evenRow = !evenRow;
 	    } else {
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
===================================================================
diff -u -r0f06a3fe1469600b56093d09d01c0922ab1cb3db -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision 0f06a3fe1469600b56093d09d01c0922ab1cb3db)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml	(.../submitFilesApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -57,7 +57,7 @@
 		<property name="eventNotificationService"><ref bean="eventNotificationService"/></property> 
 		<property name="repositoryService"><ref bean="repositoryService" /></property>
 		<property name="gradebookService"><ref bean="gradebookService" /></property>
-		<property name="auditService"><ref bean="auditService" /></property>
+		<property name="logEventService"><ref bean="logEventService" /></property>
 		<property name="submitFilesOutputFactory"><ref bean="submitFilesOutputFactory"/></property>
 	</bean>
 	
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
===================================================================
diff -u -rbbe9589ceab063d62380b9fe3f02648a4581e109 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision bbe9589ceab063d62380b9fe3f02648a4581e109)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml	(.../scratchieApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -108,7 +108,7 @@
    			<ref bean="exportToolContentService"/>
    		</property>
    		<property name="gradebookService"><ref bean="gradebookService" /></property>
-   		<property name="auditService"><ref bean="auditService"/></property>
+   		<property name="logEventService"><ref bean="logEventService"/></property>
    		<property name="messageService"><ref bean="scratchieMessageService"/></property>
 		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>   
 		<property name="eventNotificationService">
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rfcc5eca8a605afdc9e927366827553a7862000cd
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 85ef8aca5722a36582117db1e8b988e2c16b6369)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision fcc5eca8a605afdc9e927366827553a7862000cd)
@@ -69,7 +69,7 @@
 			 		<property name="dataFlowDAO"><ref bean="dataFlowDAO"/></property>
 					<property name="toolService"><ref bean="lamsToolService"/></property>
 			 		<property name="learnerService"><ref bean="learnerService"/></property>		
-					<property name="auditService"><ref bean="auditService"/></property>			 		
+					<property name="logEventService"><ref bean="logEventService"/></property>			 		
 					<property name="voteToolContentHandler"><ref bean="voteToolContentHandler"/></property>		
 			   		<property name="exportContentService"><ref bean="exportToolContentService"/></property>						
 			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>