diff --git a/AzureDevopsStateTracker/Migrations/20210720105645_FunctionToTimeInitial.cs b/AzureDevopsStateTracker/Migrations/20210720105645_FunctionToTimeInitial.cs
index d6dd362..6edbad0 100644
--- a/AzureDevopsStateTracker/Migrations/20210720105645_FunctionToTimeInitial.cs
+++ b/AzureDevopsStateTracker/Migrations/20210720105645_FunctionToTimeInitial.cs
@@ -17,7 +17,7 @@ AS BEGIN
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
-            var dropFunction = @$"DROP FUNCTION IF EXISTS {DataBaseConfig.SchemaName}.ToTime";
+            var dropFunction = @$"DROP FUNCTION IF EXISTS dbo.ToTime";
             migrationBuilder.Sql(dropFunction);
         }
     }
diff --git a/AzureDevopsStateTracker/Services/AzureDevopsStateTrackerService.cs b/AzureDevopsStateTracker/Services/AzureDevopsStateTrackerService.cs
index 7b1f699..f9c1bfb 100644
--- a/AzureDevopsStateTracker/Services/AzureDevopsStateTrackerService.cs
+++ b/AzureDevopsStateTracker/Services/AzureDevopsStateTrackerService.cs
@@ -57,8 +57,8 @@ public void Update(UpdatedWorkItemDTO update)
                             update.Resource.Revision.Fields.AreaPath,
                             update.Resource.Revision.Fields.IterationPath,
                             update.Resource.Revision.Fields.Type,
-                            update.Resource.Revision.Fields.CreatedBy,
-                            update.Resource.Revision.Fields.AssignedTo,
+                            update.Resource.Revision.Fields.CreatedBy.ExtractEmail(),
+                            update.Resource.Revision.Fields.AssignedTo.ExtractEmail(),
                             update.Resource.Revision.Fields.Tags,
                             update.Resource.Revision.Fields.Parent,
                             update.Resource.Revision.Fields.Effort,