diff --git a/modules/group_recurring_events_series/group_recurring_events_series.module b/modules/group_recurring_events_series/group_recurring_events_series.module
index e50e979542f2eb0e7f407193e85854a2c5708123..d98db0fc4bfd4ff77f4b964a7f05738129cb8cae 100644
--- a/modules/group_recurring_events_series/group_recurring_events_series.module
+++ b/modules/group_recurring_events_series/group_recurring_events_series.module
@@ -42,3 +42,12 @@ function group_recurring_events_series_entity_operation(EntityInterface $entity)
 
   return $operations;
 }
+
+/*
+ * hook_entity_type_build
+ */
+function group_recurring_events_series_entity_type_build(array &$entity_types) {
+    if(isset($entity_types['eventinstance'])) {
+        $entity_types['eventinstance']->setHandlerClass('access', 'Drupal\group_recurring_events_series\Access\GroupEventInstanceHandler');
+    }
+}
diff --git a/modules/group_recurring_events_series/src/Access/.gitkeep b/modules/group_recurring_events_series/src/Access/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/modules/group_recurring_events_series/src/Access/GroupEventInstanceHandler.php b/modules/group_recurring_events_series/src/Access/GroupEventInstanceHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..2922bd15870ccd343d8c21350fc5174d31272fd7
--- /dev/null
+++ b/modules/group_recurring_events_series/src/Access/GroupEventInstanceHandler.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\group_recurring_events_series\Access;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+
+use Drupal\recurring_events\Entity\EventSeries;
+use Drupal\recurring_events\EventInstanceAccessControlHandler;
+
+class GroupEventInstanceHandler extends EventInstanceAccessControlHandler {
+    protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+        $result = parent::checkAccess($entity, $operation, $account);
+        if(!$result->isAllowed()) {
+            // Need GroupContentAccessControlHandler not EventSeriesAccessControlHandler
+            $manager = \Drupal::service('plugin.manager.group_content_enabler');
+            $type = 'group_recurring_events_series:' . $entity->getType();
+            if($manager->hasHandler($type, 'access')) {
+              $handler = $manager->getAccessControlHandler($type);
+              $result = $handler->entityAccess($entity->getEventSeries(), $operation, $account, TRUE);
+            }
+        }
+        return $result;
+    }
+}
diff --git a/modules/recurring_events_registration/recurring_events_registration.tokens.inc b/modules/recurring_events_registration/recurring_events_registration.tokens.inc
index 83a1150bedf734d51fd02f884e1e5769d70ff403..569ead78a1830c89831d570776e9f11186b53b50 100644
--- a/modules/recurring_events_registration/recurring_events_registration.tokens.inc
+++ b/modules/recurring_events_registration/recurring_events_registration.tokens.inc
@@ -50,6 +50,17 @@ function recurring_events_registration_token_info() {
     'description' => t('The URL to delete a registrant.'),
   ];
 
+  $registrant['eventinstance'] = [
+    'name' => t('Registrant event instance'),
+    'description' => t('The eventinstance associated with a registrant'),
+    'type' => 'eventinstance',
+  ];
+  $registrant['eventseries'] = [
+    'name' => t('Registrant event series'),
+    'description' => t('The eventseries associated with a registrant'),
+    'type' => 'eventseries',
+  ];
+
   return [
     'types' => [
       'eventinstance' => $eventinstance_type,
@@ -67,6 +78,7 @@ function recurring_events_registration_token_info() {
  * Implements hook_tokens().
  */
 function recurring_events_registration_tokens($type, $tokens, array $data, array $options, BubbleableMetadata $bubbleable_metadata) {
+  $token_service = \Drupal::token();
   $replacements = [];
   if ($type == 'eventinstance' && !empty($data['eventinstance'])) {
     $event_instance = $data['eventinstance'];
@@ -108,8 +120,30 @@ function recurring_events_registration_tokens($type, $tokens, array $data, array
           }
           $replacements[$original] = $url;
           break;
+
+        case 'eventinstance':
+          $instance = $registrant->getEventInstance();
+          $bubbleable_metadata->addCacheableDependency($instance);
+          $replacements[$original] = $instance->label();
+          break;
+
+        case 'eventseries':
+          $series = $registrant->getEventSeries();
+          $bubbleable_metadata->addCacheableDependency($series);
+          $replacements[$original] = $series->label();
+          break;
       }
     }
+
+    if ($instance_tokens = $token_service->findWithPrefix($tokens, 'eventinstance')) {
+      $instance = $registrant->getEventInstance();
+      $replacements += $token_service->generate('eventinstance', $instance_tokens, ['eventinstance' => $instance], $options, $bubbleable_metadata);
+    }
+
+    if ($series_tokens = $token_service->findWithPrefix($tokens, 'eventseries')) {
+      $series = $registrant->getEventSeries();
+      $replacements += $token_service->generate('eventseries', $series_tokens, ['eventseries' => $series], $options, $bubbleable_metadata);
+    }
   }
   return $replacements;
 }
diff --git a/recurring_events.module b/recurring_events.module
index cfe4749fd985f9cf49993be227bcf3cf89aabff9..056d83bce41645c1a74c206b33f513d7613500e5 100644
--- a/recurring_events.module
+++ b/recurring_events.module
@@ -176,6 +176,33 @@ function recurring_events_eventseries_insert(EntityInterface $entity) {
   }
 }
 
+/**
+ * Implements hook_ENTITY_TYPE_translation_insert().
+ */
+function recurring_events_eventseries_translation_insert(EntityInterface $translation) {
+  if (\Drupal::isConfigSyncing()) {
+    return;
+  }
+  $creation_service = \Drupal::service('recurring_events.event_creation_service');
+  $creation_service->createInstances($translation);
+
+  $instances = $translation->event_instances->referencedEntities();
+  if (!empty($instances)) {
+    foreach ($instances as $instance) {
+      if ($instance->hasTranslation($translation->language()->getId())) {
+        $instance = $instance->getTranslation($translation->language()->getId());
+      }
+      $instance->set('eventseries_id', $translation->id());
+      $instance->setNewRevision(FALSE);
+
+      $creation_service->configureDefaultInheritances($instance, $translation->id());
+      $creation_service->updateInstanceStatus($instance, $translation);
+
+      $instance->save();
+    }
+  }
+}
+
 /**
  * Implements hook_ENTITY_TYPE_insert().
  */
@@ -727,6 +754,7 @@ function recurring_events_entity_base_field_info_alter(&$fields, EntityTypeInter
         'weight' => 0,
       ])
       ->setDisplayConfigurable('form', FALSE)
+      ->setTranslatable(TRUE)
       ->setClass(EventInstances::class);
   }
 }
diff --git a/src/Entity/EventInstance.php b/src/Entity/EventInstance.php
index 095cb3f482f1f7df601903133a93ba739bdae306..d6655cea834f28f6e9f42fb270e2c7d3cb08799a 100644
--- a/src/Entity/EventInstance.php
+++ b/src/Entity/EventInstance.php
@@ -6,8 +6,9 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\EditorialContentEntityBase;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\RevisionableInterface;
 use Drupal\recurring_events\EventInterface;
-use Drupal\user\UserInterface;
+use Drupal\recurring_events\EventUserTrait;
 
 /**
  * Defines the Event Instance entity.
@@ -105,6 +106,7 @@ use Drupal\user\UserInterface;
  *     "uuid" = "uuid",
  *     "label" = "title",
  *     "bundle" = "type",
+ *     "uid" = "uid",
  *   },
  *   revision_metadata_keys = {
  *     "revision_user" = "revision_uid",
@@ -154,6 +156,8 @@ use Drupal\user\UserInterface;
  */
 class EventInstance extends EditorialContentEntityBase implements EventInterface {
 
+  use EventUserTrait;
+
   /**
    * {@inheritdoc}
    *
@@ -234,36 +238,6 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
     return $this;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwner() {
-    return $this->get('uid')->entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwnerId() {
-    return $this->get('uid')->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwnerId($uid) {
-    $this->set('uid', $uid);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwner(UserInterface $account) {
-    $this->setOwnerId($account->id());
-    return $this;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -291,6 +265,7 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
+    $fields += static::ownerBaseFieldDefinitions($entity_type);
 
     // Standard field, used as unique if primary index.
     $fields['id'] = BaseFieldDefinition::create('integer')
@@ -298,25 +273,6 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
       ->setDescription(t('The ID of the event entity.'))
       ->setReadOnly(TRUE);
 
-    $fields['uid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Authored by'))
-      ->setDescription(t('The username of the content author.'))
-      ->setRevisionable(TRUE)
-      ->setSetting('target_type', 'user')
-      ->setDefaultValueCallback('Drupal\recurring_events\Entity\EventInstance::getCurrentUserId')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 5,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'placeholder' => '',
-          'match_limit' => 10,
-        ],
-      ])
-      ->setDisplayConfigurable('form', TRUE);
-
     // Standard field, unique outside of the scope of the current project.
     $fields['uuid'] = BaseFieldDefinition::create('uuid')
       ->setLabel(t('UUID'))
@@ -368,7 +324,8 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
     $fields['eventseries_id'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Event Series ID'))
       ->setDescription(t('The ID of the event series entity.'))
-      ->setSetting('target_type', 'eventseries');
+      ->setSetting('target_type', 'eventseries')
+      ->setTranslatable(TRUE);
 
     $fields['langcode'] = BaseFieldDefinition::create('language')
       ->setLabel(t('Language code'))
@@ -410,7 +367,11 @@ class EventInstance extends EditorialContentEntityBase implements EventInterface
    *   The event series.
    */
   public function getEventSeries() {
-    return $this->get('eventseries_id')->entity;
+    $entity = $this->get('eventseries_id')->entity;
+    if ($entity->hasTranslation($this->language()->getId())) {
+      return $entity->getTranslation($this->language()->getId());
+    }
+    return $entity;
   }
 
 }
diff --git a/src/Entity/EventSeries.php b/src/Entity/EventSeries.php
index cafb5d95cdaf9a13003fabdee6b87ae5e5c81407..54190cef57fd3c399a681e5b03c905c3a850de83 100644
--- a/src/Entity/EventSeries.php
+++ b/src/Entity/EventSeries.php
@@ -6,7 +6,9 @@ use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Entity\EditorialContentEntityBase;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\RevisionableInterface;
 use Drupal\recurring_events\EventInterface;
+use Drupal\recurring_events\EventUserTrait;
 use Drupal\user\UserInterface;
 
 /**
@@ -104,6 +106,7 @@ use Drupal\user\UserInterface;
  *     "langcode" = "langcode",
  *     "label" = "title",
  *     "uuid" = "uuid",
+ *     "uid" = "uid",
  *     "bundle" = "type",
  *   },
  *   revision_metadata_keys = {
@@ -156,6 +159,8 @@ use Drupal\user\UserInterface;
  */
 class EventSeries extends EditorialContentEntityBase implements EventInterface {
 
+  use EventUserTrait;
+
   /**
    * {@inheritdoc}
    *
@@ -236,36 +241,6 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
     return $this;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwner() {
-    return $this->get('uid')->entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwnerId() {
-    return $this->get('uid')->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwnerId($uid) {
-    $this->set('uid', $uid);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwner(UserInterface $account) {
-    $this->setOwnerId($account->id());
-    return $this;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -293,31 +268,13 @@ class EventSeries extends EditorialContentEntityBase implements EventInterface {
    */
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
+    $fields += static::ownerBaseFieldDefinitions($entity_type);
 
     $fields['id'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('ID'))
       ->setDescription(t('The ID of the eventseries entity.'))
       ->setReadOnly(TRUE);
 
-    $fields['uid'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Authored by'))
-      ->setDescription(t('The username of the content author.'))
-      ->setRevisionable(TRUE)
-      ->setSetting('target_type', 'user')
-      ->setDefaultValueCallback('Drupal\recurring_events\Entity\Event::getCurrentUserId')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 11,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'placeholder' => '',
-          'match_limit' => 10,
-        ],
-      ])
-      ->setDisplayConfigurable('form', TRUE);
-
     $fields['uuid'] = BaseFieldDefinition::create('uuid')
       ->setLabel(t('UUID'))
       ->setDescription(t('The UUID of the event entity.'))
diff --git a/src/EventCreationService.php b/src/EventCreationService.php
index cb295ed4186237d46a3ffb51219f8e557f144378..edb51d9a085077608aac5fcd0d8f4d63b4ce83dc 100644
--- a/src/EventCreationService.php
+++ b/src/EventCreationService.php
@@ -44,9 +44,9 @@ class EventCreationService {
   /**
    * Logger Factory.
    *
-   * @var \Drupal\Core\Logger\LoggerChannelFactoryInterface
+   * @var \Drupal\Core\Logger\LoggerChannel
    */
-  protected $loggerFactory;
+  protected $loggerChannel;
 
   /**
    * The messenger service.
@@ -115,7 +115,7 @@ class EventCreationService {
   public function __construct(TranslationInterface $translation, Connection $database, LoggerChannelFactoryInterface $logger, Messenger $messenger, FieldTypePluginManager $field_type_plugin_manager, EntityFieldManager $entity_field_manager, ModuleHandler $module_handler, EntityTypeManagerInterface $entity_type_manager, KeyValueFactoryInterface $key_value) {
     $this->translation = $translation;
     $this->database = $database;
-    $this->loggerFactory = $logger->get('recurring_events');
+    $this->loggerChannel = $logger->get('recurring_events');
     $this->messenger = $messenger;
     $this->fieldTypePluginManager = $field_type_plugin_manager;
     $this->entityFieldManager = $entity_field_manager;
@@ -528,8 +528,42 @@ class EventCreationService {
 
     $this->moduleHandler->alter('recurring_events_event_instance', $data);
 
-    $entity = $this->entityTypeManager->getStorage('eventinstance')->create($data);
-    $entity->save();
+    $storage = $this->entityTypeManager->getStorage('eventinstance');
+    if ($event->isDefaultTranslation()) {
+      $entity = $storage->create($data);
+    }
+    else {
+      // Grab the untranslated event series.
+      $original = $event->getUntranslated();
+      // Find the corresponding default language event instance that matches
+      // the date and time of the version we wish to translate, so that we are
+      // mapping the translations from default language to translated language
+      // appropriately.
+      $entity_ids = $storage->getQuery()
+        ->condition('date__value', $data['date']['value'])
+        ->condition('date__end_value', $data['date']['end_value'])
+        ->condition('eventseries_id', $data['eventseries_id'])
+        ->condition('type', $data['type'])
+        ->condition('langcode', $original->language()->getId())
+        ->accessCheck(FALSE)
+        ->execute();
+
+      if (!empty($entity_ids)) {
+        // Load the default language version of the event instance.
+        $entity = $storage->load(reset($entity_ids));
+        // Only add a translation if we do not already have one.
+        if (!$entity->hasTranslation($event->language()->getId())) {
+          $entity->addTranslation($event->language()->getId(), $data);
+        }
+      }
+    }
+
+    if ($entity) {
+      $entity->save();
+    }
+    else {
+      $this->loggerChannel->warning('Missing event instance in default language. Translation could not be created');
+    }
 
     return $entity;
   }
diff --git a/src/EventUserTrait.php b/src/EventUserTrait.php
new file mode 100644
index 0000000000000000000000000000000000000000..79694531f0347df2656fb347f13d2fb137d735eb
--- /dev/null
+++ b/src/EventUserTrait.php
@@ -0,0 +1,94 @@
+<?php
+
+namespace Drupal\recurring_events;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Exception\UnsupportedEntityTypeDefinitionException;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\user\UserInterface;
+
+trait EventUserTrait {
+
+  /**
+   * Returns an array of base field definitions for entity owners.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type to add the uid field to.
+   *
+   * @return \Drupal\Core\Field\BaseFieldDefinition[]
+   *   An array of base field definitions.
+   *
+   * @throws \Drupal\Core\Entity\Exception\UnsupportedEntityTypeDefinitionException
+   *   Thrown when the entity type does not have an "uid" entity key.
+   */
+  public static function ownerBaseFieldDefinitions(EntityTypeInterface $entity_type) {
+    if (!$entity_type->hasKey('uid')) {
+      throw new UnsupportedEntityTypeDefinitionException('The entity type ' . $entity_type->id() . ' does not have a "uid" entity key.');
+    }
+
+    return [
+      $entity_type->getKey('uid') => BaseFieldDefinition::create('entity_reference')
+        ->setLabel(new TranslatableMarkup('User ID'))
+        ->setSetting('target_type', 'user')
+        ->setTranslatable($entity_type->isTranslatable())
+        ->setDefaultValueCallback(static::class . '::getDefaultEntityOwner'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwnerId() {
+    return $this->getEntityKey('uid');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwnerId($uid) {
+    $key = $this->getEntityType()->getKey('uid');
+    $this->set($key, $uid);
+
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwner() {
+    $key = $this->getEntityType()->getKey('uid');
+    return $this->get($key)->entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwner(UserInterface $account) {
+    $key = $this->getEntityType()->getKey('uid');
+    $this->set($key, $account);
+
+    return $this;
+  }
+
+  /**
+   * Default value callback for 'uid' base field.
+   *
+   * @return mixed
+   *   A default value for the uid field.
+   */
+  public static function getDefaultEntityOwner() {
+    return \Drupal::currentUser()->id();
+  }
+
+  /**
+   * Backwards compatibility for getCurrentUserId().
+   *
+   * @return mixed
+   *   A default value for the uid field.
+   */
+  public static function getCurrentUserId() {
+    return static::getDefaultEntityOwner();
+  }
+
+}
diff --git a/src/Plugin/ComputedField/EventInstances.php b/src/Plugin/ComputedField/EventInstances.php
index e5efd463c44ad2e4134839680cf86e09fe524a90..769412bc3770c45848d654f2c88bb680c4a026eb 100644
--- a/src/Plugin/ComputedField/EventInstances.php
+++ b/src/Plugin/ComputedField/EventInstances.php
@@ -29,7 +29,7 @@ class EventInstances extends EntityReferenceFieldItemList {
       });
 
       foreach ($instances as $key => $instance) {
-        $this->list[$key] = $this->createItem($key, $instance);
+        $this->list[$key] = $this->createItem($key, $instance->getTranslation($this->getLangcode()));
       }
     }
   }