diff --git a/protected/controllers/AdminDatasetController.php b/protected/controllers/AdminDatasetController.php
index a166738b8c..2266f9da88 100644
--- a/protected/controllers/AdminDatasetController.php
+++ b/protected/controllers/AdminDatasetController.php
@@ -210,7 +210,8 @@ public function actionUpdate($id)
 
         //curator
         $curatorId = $postDataset['curator_id'];
-        if ($curatorId !== $model->curator_id) {
+
+        if ((int) $curatorId !== (int) $model->curator_id) {
             CurationLog::createlog_assign_curator($id, $curatorId);
             $model->curator_id = $curatorId;
         }
@@ -541,7 +542,7 @@ private function renderNotificationsAccordingToStatus($uploadStatus, $previousSt
                 $statusIsSet = true;
         }
 
-        if ($statusIsSet) {
+        if (($previousStatus !== $uploadStatus) && $statusIsSet) {
             CurationLog::createlog($uploadStatus, $model->id);
         }
     }
diff --git a/tests/functional/AdminDatasetCurationLogCest.php b/tests/functional/AdminDatasetCurationLogCest.php
new file mode 100644
index 0000000000..f54669ff3a
--- /dev/null
+++ b/tests/functional/AdminDatasetCurationLogCest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * run with:
+ * docker-compose run --rm test ./vendor/codeception/codeception/codecept run functional AdminDatasetCurationLogCest
+ */
+class AdminDatasetCurationLogCest
+{
+    public function checkCurationLogIsNotUpdatedIfCuratorNotUpdated(FunctionalTester $I)
+    {
+        $I->amOnPage('/site/login');
+        $I->submitForm('form.form-horizontal', [
+                'LoginForm[username]' => 'admin@gigadb.org',
+                'LoginForm[password]' => 'gigadb'
+            ]
+        );
+        $I->amOnPage('adminDataset/update/id/5');
+        $I->seeNumberOfElements('.table tbody tr', 1);
+        $I->canSee('No results found.');
+        $I->checkOption('#Dataset_Epigenomic');
+        $I->click('Save');
+
+        $I->canSee('Updated successfully!');
+        $I->cantSee('No results found.');
+        $I->canSee('Status changed to ImportFromEM');
+        $I->seeNumberOfElements('.table tbody tr', 1);
+    }
+
+    public function checkCurationLogIsUpdatedIfCuratorIsUpdated(FunctionalTester $I)
+    {
+        $I->amOnPage('/site/login');
+        $I->submitForm('form.form-horizontal', [
+                'LoginForm[username]' => 'admin@gigadb.org',
+                'LoginForm[password]' => 'gigadb'
+            ]
+        );
+        $I->amOnPage('adminDataset/update/id/5');
+        $I->seeNumberOfElements('.table tbody tr', 1);
+        $I->canSee('No results found.');
+        $I->selectOption('form select[id=Dataset_curator_id]', 988);
+        $I->click('Save');
+
+        $I->canSee('Updated successfully!');
+
+        $I->cantSee('No results found.');
+        $I->canSee('Status changed to ImportFromEM');
+        $I->canSee('Curator Assigned: Chris A');
+        $I->seeNumberOfElements('.table tbody tr', 2);
+    }
+}