diff --git a/Disco.Services/Documents/AttachmentImport/Importer.cs b/Disco.Services/Documents/AttachmentImport/Importer.cs
index ffc5da11..bba9b16b 100644
--- a/Disco.Services/Documents/AttachmentImport/Importer.cs
+++ b/Disco.Services/Documents/AttachmentImport/Importer.cs
@@ -206,7 +206,7 @@ namespace Disco.Services.Documents.AttachmentImport
                 comments = string.Format("Generated: {0:s}", Identifier.TimeStamp);
             }
 
-            User creatorUser = UserService.GetUser(Identifier.CreatorId, Database);
+            User creatorUser = UserService.GetUser(Identifier.CreatorId, Database, true);
             if (creatorUser == null)
             {
                 // No Creator User (or Username invalid)
diff --git a/Disco.Services/Users/UserFlags/UserFlagExtensions.cs b/Disco.Services/Users/UserFlags/UserFlagExtensions.cs
index 87612dce..d0dd5beb 100644
--- a/Disco.Services/Users/UserFlags/UserFlagExtensions.cs
+++ b/Disco.Services/Users/UserFlags/UserFlagExtensions.cs
@@ -101,6 +101,7 @@ namespace Disco.Services
                 User = u,
                 AddedDate = DateTime.Now,
                 AddedUser = AddingUser,
+                AddedUserId = AddingUser.UserId,
                 Comments = string.IsNullOrWhiteSpace(Comments) ? null : Comments.Trim()
             };