diff --git a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
index a786cd2c..7394bf76 100644
--- a/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
+++ b/apcd-cms/src/apps/extension/templates/extension_submission_form/extension_form_success.html
@@ -8,6 +8,6 @@ <h1>Request to Submit Extension</h1>
     <p>
         Your extension submission was successful.
     </p>
-    <a class="c-button c-button--primary" href="/submissions/extension-request/">Go Back to Extensions</a>
+    <a class="c-button c-button--primary" href="/workbench/dashboard">Go to Dashboard</a>
 </div>
 {% endblock %}
diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py
index 17b97adf..ddb16e22 100644
--- a/apcd-cms/src/apps/utils/apcd_database.py
+++ b/apcd-cms/src/apps/utils/apcd_database.py
@@ -1278,7 +1278,7 @@ def get_applicable_data_periods(submitter_id):
             sslmode='require',
         )
         cur = conn.cursor()
-        query = """ SELECT data_period_start FROM submitter_calendar WHERE submitter_id = (%s) AND cancelled = 'FALSE' AND granted_reprieve='FALSE' AND submission_id is Null """
+        query = """ SELECT distinct data_period_start FROM submitter_calendar WHERE submitter_id = (%s) AND cancelled = 'FALSE' AND granted_reprieve='FALSE' AND submission_id is Null """
         cur.execute(query, (submitter_id,))
         return cur.fetchall()