diff --git a/CHANGELOG.md b/CHANGELOG.md
index 624ebb3c62..1a95e317b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
 
+- Fix #2033: Create a mockup for all upload statuses except published
 - Feat #2066: Update file attribute values form layout and add expand button for long values
 - Feat #2102: Delete outdated apidocs files
 - Feat #1667: Add log entry when minting DOI
diff --git a/protected/controllers/AdminDatasetController.php b/protected/controllers/AdminDatasetController.php
index e40f931e7a..e2ca16c5c1 100644
--- a/protected/controllers/AdminDatasetController.php
+++ b/protected/controllers/AdminDatasetController.php
@@ -327,16 +327,26 @@ public function actionUpdate($id)
      */
     public function actionPrivate()
     {
-        $id = $_GET['identifier'];
+        $id = Yii::$app->request->get('identifier');
         $model= Dataset::model()->find("identifier=?", array($id));
         $datasetPageSettings = new DatasetPageSettings($model);
-        if ( "invalid" === $datasetPageSettings->getPageType() ) {
+        $pageType = $datasetPageSettings->getPageType();
+
+        if (!in_array($pageType, ['invalid', 'public', 'hidden', 'draft', 'mockup'])) {
+            throw new CHttpException(404, 'Page type not found');
+        }
+
+        if ( "invalid" === $pageType) {
             $this->redirect('/site/index');
-        } elseif ( "public" === $datasetPageSettings->getPageType() ) {
+        } elseif ( "public" === $pageType) {
             $this->redirect('/dataset/'.$model->identifier);
-        } elseif ( "hidden" === $datasetPageSettings->getPageType() || "draft" === $datasetPageSettings->getPageType() ) {
+        } else {
             $model->token = Yii::$app->security->generateRandomString(16);
-            $model->save();
+
+            if (!$model->save()) {
+                throw new CHttpException(500, 'Fail to update dataset token');
+            }
+
             $this->redirect('/dataset/'.$model->identifier.'/token/'.$model->token);
         }
     }
diff --git a/protected/views/adminDataset/_form.php b/protected/views/adminDataset/_form.php
index fca4062026..1b2ea71487 100644
--- a/protected/views/adminDataset/_form.php
+++ b/protected/views/adminDataset/_form.php
@@ -5,7 +5,7 @@
 <?php } ?>
 
 <?php if ($flashError = Yii::app()->user->getFlash('updateError')) { ?>
-    <div class="alert alert-danger" role="alert">
+    <div id="flashError" class="alert alert-danger" role="alert">
         <?= $flashError ?>
     </div>
 <?php } ?>
@@ -554,7 +554,7 @@
 
       if ($showCreateResetUrlBtn) {
         ?>
-        <a class="btn background-btn-o" href="<?php echo Yii::app()->createUrl('/adminDataset/private/identifier/' . $model->identifier) ?>" title="This will save any changes made on this page AND create a new mockup page URL/token link" data-toggle="tooltip">Create/Reset Private URL</a>
+        <a id="mockup" class="btn background-btn-o" href="<?php echo Yii::app()->createUrl('/adminDataset/private/identifier/' . $model->identifier) ?>" title="This will save any changes made on this page AND create a new mockup page URL/token link" data-toggle="tooltip">Create/Reset Private URL</a>
         <?php
       }
       if ($showMockupBtn) {
@@ -643,6 +643,32 @@ class="form-control"
     </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 <script>
+    $(document).ready(function () {
+        $('#mockup').on('click', function (event) {
+            event.preventDefault();
+
+            mockupUrl = $(this).attr("href");
+            form = $('#dataset-form');
+
+            $.ajax({
+                url: form.attr('action'),
+                method: 'POST',
+                data: form.serialize(),
+                success: function (response, textStatus, xhr) {
+                    if (200 === xhr.status) {
+                        window.location.href = mockupUrl;
+                    } else {
+                        $('#flashError').html('An error occurred while trying to save the dataset')
+                    }
+
+                },
+                error: function (error) {
+                    $('#flashError').html('An error occurred while trying to save the dataset')
+                }
+            })
+        });
+    });
+
     $(function() {
 
         var publication_date = $('.js-date-pub');
diff --git a/tests/acceptance/AdminDatasetForm.feature b/tests/acceptance/AdminDatasetForm.feature
index 2a1c2f742d..0b6d6c8890 100644
--- a/tests/acceptance/AdminDatasetForm.feature
+++ b/tests/acceptance/AdminDatasetForm.feature
@@ -131,10 +131,16 @@ Feature: form to update dataset details
   Scenario: Can create/reset private url
     When I am on "/adminDataset/update/id/5"
     And I press the button "Create/Reset Private URL"
-    And I wait "1" seconds
+    And I wait "3" seconds
     Then I should see current url contains "/dataset/100039/token/"
     And I should see "Genomic data of the Puerto Rican Parrot (Amazona vittata) from a locally funded project."
 
+  @ok @dataset-status
+  Scenario: Can't see create/reset private url for a published dataset
+    When I am on "/adminDataset/update/id/8"
+    Then I should not see "Create/Reset Private URL"
+    And I should not see "Open Private URL"
+
   @ok @issue-1023
   Scenario: Open private url is working
     When I am on "/adminDataset/update/id/5"
@@ -189,6 +195,7 @@ Feature: form to update dataset details
     And I fill in the field of "name" "Dataset[title]" with "test dataset"
     And I fill in the field of "name" "Dataset[identifier]" with "123789"
     And I fill in the field of "name" "Dataset[ftp_site]" with "ftp://test"
+    When I check the field "Dataset_Epigenomic"
     And I press the button "Create"
     And I wait "1" seconds
     And I am on "/adminDataset/update/id/2741"
@@ -465,14 +472,20 @@ Feature: form to update dataset details
       | "DataAvailableForReview" |
       | "DataPending"            |
 
-  @ok @dataset-status
-  Scenario: Links to create mockup or to open mockup are not present for a published dataset
+  @ok @test
+  Scenario: Links to create mockup is present for a submitted dataset
     Given I am on "/adminDataset/update/id/5"
-    And I select "Published" from the field "Dataset_upload_status"
+    And I select "DataAvailableForReview" from the field "Dataset_upload_status"
     And I press the button "Save"
     When I am on "/adminDataset/update/id/5"
-    Then I should not see "Create/Reset Private URL"
-    And I should not see "Open Private URL"
+    And I select "Submitted" from the field "Dataset_upload_status"
+    And I press the button "Save"
+    When I am on "/adminDataset/update/id/5"
+    Then I should see "Create/Reset Private URL"
+    And I press the button "Create/Reset Private URL"
+    And I wait "3" seconds
+    Then I should see current url contains "/dataset/100039/token/"
+    And I should see "Genomic data of the Puerto Rican Parrot (Amazona vittata) from a locally funded project."
 
 
   @ok @issue-1812 @mockup