diff --git a/src/WorkItemMigrator/JiraExport/JiraItem.cs b/src/WorkItemMigrator/JiraExport/JiraItem.cs
index 15e48ab0..f90e0a35 100644
--- a/src/WorkItemMigrator/JiraExport/JiraItem.cs
+++ b/src/WorkItemMigrator/JiraExport/JiraItem.cs
@@ -485,12 +485,12 @@ private static Dictionary<string, object> ExtractFields(string key, JObject remo
                 {
                     value = prop.Value.Value<string>();
                 }
-                // User picker, cloud
-                else if (type == JTokenType.Object && prop.Value["accountId"] != null
+                // User picker, server ('name' check) + cloud ('accountId' check)
+                else if (type == JTokenType.Object && (prop.Value["accountId"] != null || prop.Value["name"] != null)
                     && prop.Value["emailAddress"] != null && prop.Value["avatarUrls"] != null
                     && prop.Value["displayName"] != null)
                 {
-                    value = prop.Value["accountId"].ToString();
+                    value = extractAccountIdOrUsername(prop.Value);
                 }
                 // User picker, on-prem
                 else if (type == JTokenType.Object && prop.Value["key"] != null