diff --git a/app/models/concerns/user_events.rb b/app/models/concerns/user_events.rb
index 322bda66f..6cf8e9ac6 100644
--- a/app/models/concerns/user_events.rb
+++ b/app/models/concerns/user_events.rb
@@ -1,15 +1,26 @@
 module UserEvents
   extend ActiveSupport::Concern
 
+  # EPP requires a server defined creator ID, which should be registrar code if we have one
   def cr_id
-    if versions.first.object.nil?
-      cr_registrar_id =versions.first.object_changes['registrar_id'].second
+    # try this, rebuild user for registrar before searching history? really?
+    registrar = self.creator.try(:registrar)
+    if registrar.present?            # Did creator return a kind of User that has a registrar?
+      registrar.code
     else
-      # untested, expected never to execute
-      cr_registrar_id = versions.first.object['registrar_id']
-    end
-    if cr_registrar_id.present?
-      Registrar.find(cr_registrar_id).code
+      if versions.first.object.nil?
+        cr_registrar_id =versions.first.object_changes['registrar_id'].second
+      else
+        # untested, expected never to execute
+        cr_registrar_id = versions.first.object['registrar_id']
+      end
+
+      if cr_registrar_id.present?
+        Registrar.find(cr_registrar_id).code
+      else
+        # cr_id optional for domain, but required for contact; but we want something here anyway
+        self.creator_str # Fallback if we failed, maybe we can find a string here
+      end
     end
   end