diff --git a/RIGS/templates/event_print.xml b/RIGS/templates/event_print.xml
index e43ea413..43b0d849 100644
--- a/RIGS/templates/event_print.xml
+++ b/RIGS/templates/event_print.xml
@@ -106,7 +106,7 @@
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
                     <drawCenteredString x="302.5" y="26">
-                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                        {{info_string}}
                     </drawCenteredString>
                 </pageGraphics>
 
@@ -122,7 +122,7 @@
                     <drawCenteredString x="302.5" y="38">[Page <pageNumber/> of <getName id="lastPage" default="0" />]</drawCenteredString>
                     <setFont name="OpenSans" size="7" />
                     <drawCenteredString x="302.5" y="26">
-                        [Paperwork generated{% if current_user %} by {{current_user.name}} |{% endif %} {% now "d/m/Y H:i" %} | {{object.current_version_id}}]
+                        {{info_string}}
                     </drawCenteredString>
                 </pageGraphics>
                 <frame id="main" x1="50" y1="65" width="495" height="727"/>
diff --git a/RIGS/views/rigboard.py b/RIGS/views/rigboard.py
index 709fb1f8..1adbfd57 100644
--- a/RIGS/views/rigboard.py
+++ b/RIGS/views/rigboard.py
@@ -185,11 +185,15 @@ class EventPrint(generic.View):
 
         merger = PdfFileMerger()
 
+        user_str = f"by {request.user.name} " if request.user is not None else ""
+        time = timezone.now().strftime('%d/%m/%Y %H:%I')
+
         context = {
             'object': object,
             'quote': True,
             'current_user': request.user,
-            'filename': 'Event_{}_{}_{}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date)
+            'filename': 'Event_{}_{}_{}.pdf'.format(object.display_id, re.sub(r'[^a-zA-Z0-9 \n\.]', '', object.name), object.start_date),
+            'info_string': f"[Paperwork generated {user_str}on {time} - {object.current_version_id}]",
         }
 
         rml = template.render(context)
diff --git a/versioning/versioning.py b/versioning/versioning.py
index 45ab3c6d..48931b0c 100644
--- a/versioning/versioning.py
+++ b/versioning/versioning.py
@@ -9,12 +9,12 @@ from reversion.models import Version, VersionQuerySet
 class RevisionMixin:
     @property
     def is_first_version(self):
-        versions = Version.objects.get_for_object(self)
+        versions = RIGSVersion.objects.get_for_object(self)
         return len(versions) == 1
 
     @property
     def current_version(self):
-        version = Version.objects.get_for_object(self).select_related('revision').first()
+        version = RIGSVersion.objects.get_for_object(self).select_related('revision').first()
         return version
 
     @property