diff --git a/modules/opencase_cases/src/Form/OCCaseFeeForm.php b/modules/opencase_cases/src/Form/OCCaseFeeForm.php
index 08e238c..fe19272 100644
--- a/modules/opencase_cases/src/Form/OCCaseFeeForm.php
+++ b/modules/opencase_cases/src/Form/OCCaseFeeForm.php
@@ -54,18 +54,9 @@ class OCCaseFeeForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime($this->time->getRequestTime());
-      $entity->setRevisionUserId($this->account->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
+    $entity->setNewRevision();
+    $entity->setRevisionCreationTime(REQUEST_TIME);
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
 
     $status = parent::save($form, $form_state);
 
diff --git a/modules/opencase_cases/src/Form/OCCaseForm.php b/modules/opencase_cases/src/Form/OCCaseForm.php
index 429a8cf..8e8a3ac 100644
--- a/modules/opencase_cases/src/Form/OCCaseForm.php
+++ b/modules/opencase_cases/src/Form/OCCaseForm.php
@@ -38,18 +38,9 @@ class OCCaseForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime( \Drupal::time()->getRequestTime());
-      $entity->setRevisionUserId(\Drupal::currentUser()->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
+    $entity->setNewRevision();
+    $entity->setRevisionCreationTime(REQUEST_TIME);
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
 
     $status = parent::save($form, $form_state);
 
diff --git a/modules/opencase_cases/src/Form/OCCaseProvisionForm.php b/modules/opencase_cases/src/Form/OCCaseProvisionForm.php
index 0634590..7a00a3c 100644
--- a/modules/opencase_cases/src/Form/OCCaseProvisionForm.php
+++ b/modules/opencase_cases/src/Form/OCCaseProvisionForm.php
@@ -54,18 +54,9 @@ class OCCaseProvisionForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime($this->time->getRequestTime());
-      $entity->setRevisionUserId($this->account->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
+    $entity->setNewRevision();
+    $entity->setRevisionCreationTime(REQUEST_TIME);
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
 
     $status = parent::save($form, $form_state);
 
diff --git a/modules/opencase_entities/src/Controller/OCActivityController.php b/modules/opencase_entities/src/Controller/OCActivityController.php
index 1e51905..614a187 100644
--- a/modules/opencase_entities/src/Controller/OCActivityController.php
+++ b/modules/opencase_entities/src/Controller/OCActivityController.php
@@ -43,7 +43,8 @@ class OCActivityController extends ControllerBase implements ContainerInjectionI
    */
   public function revisionPageTitle($oc_activity_revision) {
     $oc_activity = $this->entityTypeManager()->getStorage('oc_activity')->loadRevision($oc_activity_revision);
-    return $this->t('Revision of %title from %date', ['%title' => $oc_activity->label(), '%date' => format_date($oc_activity->getRevisionCreationTime())]);
+    $date = \Drupal::service('date.formatter')->format($oc_activity->getRevisionCreationTime());
+    return $this->t('Revision of %title from %date', ['%title' => $oc_activity->label(), '%date' => $date]);
   }
 
   /**
diff --git a/modules/opencase_entities/src/Form/OCActivityForm.php b/modules/opencase_entities/src/Form/OCActivityForm.php
index 54cdd28..ecc0595 100644
--- a/modules/opencase_entities/src/Form/OCActivityForm.php
+++ b/modules/opencase_entities/src/Form/OCActivityForm.php
@@ -38,18 +38,9 @@ class OCActivityForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime(REQUEST_TIME);
-      $entity->setRevisionUserId(\Drupal::currentUser()->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
+    $entity->setNewRevision();
+    $entity->setRevisionCreationTime(REQUEST_TIME);
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
 
     $status = parent::save($form, $form_state);
 
@@ -66,8 +57,8 @@ class OCActivityForm extends ContentEntityForm {
         ]));
     }
     // If you have unpublished the entity and you can't see unpublished entities, redirect to a more informative message than just "Access Denied".
-    if (!$form_state->getValue('status')['value'] && !\Drupal::currentUser()->hasPermission('view unpublished activity entities')) {
-       \Drupal::messenger()->addMessage($this->t('The %bundle is now unpublished & hidden from you.', [
+    if (is_array($form_state->getValue('status')) && $form_state->getValue('status')['value'] == false && !\Drupal::currentUser()->hasPermission('view unpublished actor entities')) {
+      \Drupal::messenger()->addMessage($this->t('The %bundle is now unpublished & hidden from you.', [
         '%bundle' => $entity->bundle(),
       ]));
       $form_state->setRedirect('<front>');
diff --git a/modules/opencase_entities/src/Form/OCActorForm.php b/modules/opencase_entities/src/Form/OCActorForm.php
index 768432e..c242099 100644
--- a/modules/opencase_entities/src/Form/OCActorForm.php
+++ b/modules/opencase_entities/src/Form/OCActorForm.php
@@ -38,8 +38,6 @@ class OCActorForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-    // Always make a new revision for a person. They are not changed often and people are likely to
-    // want to know what has happened to them over time.
     $entity->setNewRevision();
     $entity->setRevisionCreationTime(REQUEST_TIME);
     $entity->setRevisionUserId(\Drupal::currentUser()->id());
diff --git a/modules/opencase_entities/src/Form/OCOrganisationForm.php b/modules/opencase_entities/src/Form/OCOrganisationForm.php
index 652af4b..cd92dd4 100644
--- a/modules/opencase_entities/src/Form/OCOrganisationForm.php
+++ b/modules/opencase_entities/src/Form/OCOrganisationForm.php
@@ -54,18 +54,9 @@ class OCOrganisationForm extends ContentEntityForm {
    */
   public function save(array $form, FormStateInterface $form_state) {
     $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime($this->time->getRequestTime());
-      $entity->setRevisionUserId($this->account->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
+    $entity->setNewRevision();
+    $entity->setRevisionCreationTime(REQUEST_TIME);
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
 
     $status = parent::save($form, $form_state);