diff --git a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
index 8e08912de0..3e7b61f091 100644
--- a/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
+++ b/source/java/org/alfresco/repo/audit/hibernate/HibernateAuditDAO.java
@@ -111,6 +111,10 @@ public class HibernateAuditDAO extends HibernateDaoSupport implements AuditDAO,
 
     public void audit(AuditState auditInfo)
     {
+        if(auditInfo.getUserIdentifier() == null)
+        {
+            auditInfo.setUserIdentifier(AuthenticationUtil.getSystemUserName());
+        }
         if(AuthenticationUtil.getCurrentUserName() == null)
         {
             AuthenticationUtil.setSystemUserAsCurrentUser();