diff --git a/source/Plugins/AyaNova.Plugin.V8/V8.cs b/source/Plugins/AyaNova.Plugin.V8/V8.cs
index 0655221..4ef2bcf 100644
--- a/source/Plugins/AyaNova.Plugin.V8/V8.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/V8.cs
@@ -273,6 +273,8 @@ namespace AyaNova.PlugIn.V8
             try
             {
                 progress.Op("Preparing to export....");
+                ResetUniqueUserNames();
+                ResetUniqueNames();
                 V7ToV8IdMap.Clear();
                 V7ToV8WorkOrderItemStatusIdMap.Clear();
                 TagMap.Clear();
diff --git a/source/Plugins/AyaNova.Plugin.V8/util.cs b/source/Plugins/AyaNova.Plugin.V8/util.cs
index 8aecde8..9fd9240 100644
--- a/source/Plugins/AyaNova.Plugin.V8/util.cs
+++ b/source/Plugins/AyaNova.Plugin.V8/util.cs
@@ -44,6 +44,7 @@ namespace AyaNova.PlugIn.V8
                 client.Dispose();
             client = null;
             client = new HttpClient();
+            client.Timeout = new TimeSpan(0, 0, 30);
             client.BaseAddress = new Uri(ApiBaseUrl);
             client.DefaultRequestHeaders.Accept.Clear();
             client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));