diff --git a/app/Http/Livewire/CategoryEditForm.php b/app/Http/Livewire/CategoryEditForm.php
index 2cba9a220d..d69c09971a 100644
--- a/app/Http/Livewire/CategoryEditForm.php
+++ b/app/Http/Livewire/CategoryEditForm.php
@@ -6,20 +6,20 @@ use Livewire\Component;
 
 class CategoryEditForm extends Component
 {
-    public $checkinEmail;
-
     public $defaultEulaText;
 
     public $eulaText;
 
     public $requireAcceptance;
 
+    public $sendCheckInEmail;
+
     public $useDefaultEula;
 
     public function mount()
     {
         if ($this->eulaText || $this->useDefaultEula) {
-            $this->checkinEmail = true;
+            $this->sendCheckInEmail = true;
         }
     }
 
@@ -31,7 +31,7 @@ class CategoryEditForm extends Component
     public function updated($property, $value)
     {
         if (in_array($property, ['eulaText', 'useDefaultEula']) && ($this->eulaText || $this->useDefaultEula)) {
-            $this->checkinEmail = (bool)$value;
+            $this->sendCheckInEmail = (bool)$value;
         }
     }
 
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index fb54c125e2..e49d9cc0fa 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -41,7 +41,7 @@
     <div class="form-group">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
-                {{ Form::checkbox('checkin_email', '1', null, ['wire:model' => 'checkinEmail', 'aria-label'=>'checkin_email']) }}
+                {{ Form::checkbox('checkin_email', '1', null, ['wire:model' => 'sendCheckInEmail', 'aria-label'=>'checkin_email']) }}
                 {{ trans('admin/categories/general.checkin_email') }}
             </label>
             @if ($this->shouldDisplayEmailMessage)
diff --git a/tests/Feature/Livewire/CategoryEditFormTest.php b/tests/Feature/Livewire/CategoryEditFormTest.php
index 753a74bca0..448e61cee6 100644
--- a/tests/Feature/Livewire/CategoryEditFormTest.php
+++ b/tests/Feature/Livewire/CategoryEditFormTest.php
@@ -16,56 +16,56 @@ class CategoryEditFormTest extends TestCase
     public function testSendEmailCheckboxIsCheckedOnLoadWhenSendEmailIsExistingSetting()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => true,
+            'sendCheckInEmail' => true,
             'eulaText' => '',
             'useDefaultEula' => false,
-        ])->assertSet('checkinEmail', true);
+        ])->assertSet('sendCheckInEmail', true);
     }
 
     public function testSendEmailCheckboxIsCheckedOnLoadWhenCategoryEulaSet()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => false,
+            'sendCheckInEmail' => false,
             'eulaText' => 'Some Content',
             'useDefaultEula' => false,
-        ])->assertSet('checkinEmail', true);
+        ])->assertSet('sendCheckInEmail', true);
     }
 
     public function testSendEmailCheckboxIsCheckedOnLoadWhenUsingDefaultEula()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => false,
+            'sendCheckInEmail' => false,
             'eulaText' => '',
             'useDefaultEula' => true,
-        ])->assertSet('checkinEmail', true);
+        ])->assertSet('sendCheckInEmail', true);
     }
 
     public function testSendEmailCheckBoxIsUncheckedOnLoadWhenSendEmailIsFalseNoCategoryEulaSetAndNotUsingDefaultEula()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => false,
+            'sendCheckInEmail' => false,
             'eulaText' => '',
             'useDefaultEula' => false,
-        ])->assertSet('checkinEmail', false);
+        ])->assertSet('sendCheckInEmail', false);
     }
 
     public function testSendEmailCheckboxIsCheckedWhenCategoryEulaEntered()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => false,
+            'sendCheckInEmail' => false,
             'useDefaultEula' => false,
-        ])->assertSet('checkinEmail', false)
+        ])->assertSet('sendCheckInEmail', false)
             ->set('eulaText', 'Some Content')
-            ->assertSet('checkinEmail', true);
+            ->assertSet('sendCheckInEmail', true);
     }
 
     public function testSendEmailCheckboxCheckedWhenUseDefaultEulaSelected()
     {
         Livewire::test(CategoryEditForm::class, [
-            'checkinEmail' => false,
+            'sendCheckInEmail' => false,
             'useDefaultEula' => false,
-        ])->assertSet('checkinEmail', false)
+        ])->assertSet('sendCheckInEmail', false)
             ->set('useDefaultEula', true)
-            ->assertSet('checkinEmail', true);
+            ->assertSet('sendCheckInEmail', true);
     }
 }