diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index d2cc4ac..d67a127 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -469,14 +469,14 @@ namespace AyaNova.PlugIn.V8
                 if (!progress.KeepGoing) return;
                 User c = User.GetItem(i.ID);
                 var newId = Map[c.ID];
-                var creator = Map[c.Creator];
-                var modifier = Map[c.Modifier];
+                var creator = SafeGetUserMap(c.Creator);
+                var modifier = SafeGetUserMap(c.Modifier);
 
-                await util.EventLog((int)util.AyaType.User, newId, creator, modifier, c.Created, c.Modified);
+                await util.EventLog(util.AyaType.User, newId, creator, modifier, c.Created, c.Modified);
             }
 
         }
-        #endregion clients
+        #endregion users
 
         #region clients
         private async System.Threading.Tasks.Task ExportClients(ProgressForm progress)
@@ -540,7 +540,7 @@ namespace AyaNova.PlugIn.V8
                 }
 
                 //Event log fixup
-                await util.EventLog((int)util.AyaType.Customer, RavenId, SafeGetUserMap(c.Creator), SafeGetUserMap(c.Modifier), c.Created, c.Modified);
+                await util.EventLog(util.AyaType.Customer, RavenId, SafeGetUserMap(c.Creator), SafeGetUserMap(c.Modifier), c.Created, c.Modified);
 
             }
         }