diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb
index 540e2cd0..b75839f6 100644
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@@ -14,8 +14,15 @@
         Created = 0
     End Enum
 
-    Public Enum ActionType
+    Public Enum EnvelopeHistoryActionType
         Created = 0
+        Saved = 1
+        Sent = 2
+        EmailSent = 3
+        Delivered = 4
+        Seen = 5
+        Signed = 6
+        Rejected = 7
     End Enum
 
     Public Enum ContractType
diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
index a1c91509..23652c96 100644
--- a/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
+++ b/EnvelopeGenerator.Common/Entities/EnvelopeHistoryEntry.vb
@@ -1,9 +1,8 @@
 Public Class EnvelopeHistoryEntry
     Public EnvelopeId As Integer
-    Public ActionType As Constants.ActionType
     Public UserReference As String
+    Public ActionType As Constants.EnvelopeHistoryActionType
     Public ActionDescription As String
     Public ActionDate As DateTime
-    Public UserEmailAddress As String
 
 End Class
diff --git a/EnvelopeGenerator.Common/Models/HistoryModel.vb b/EnvelopeGenerator.Common/Models/HistoryModel.vb
index 9d000b89..f2196183 100644
--- a/EnvelopeGenerator.Common/Models/HistoryModel.vb
+++ b/EnvelopeGenerator.Common/Models/HistoryModel.vb
@@ -24,7 +24,7 @@ Public Class HistoryModel
 
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pHistory.EnvelopeId
-            oCommand.Parameters.Add("USER_REFERENCE", SqlDbType.NVarChar).Value = pHistory.UserEmailAddress
+            oCommand.Parameters.Add("USER_REFERENCE", SqlDbType.NVarChar).Value = pHistory.UserReference
             oCommand.Parameters.Add("ACTION_TYPE", SqlDbType.NVarChar).Value = pHistory
             oCommand.Parameters.Add("ACTION_DESCRIPTION", SqlDbType.NVarChar).Value = pHistory.ActionDescription
             oCommand.Parameters.Add("ACTION_DATE", SqlDbType.DateTime).Value = pHistory