diff --git a/templates/credentials/schedule.html b/templates/credentials/schedule.html
index df7216e48f2..f3110af354c 100644
--- a/templates/credentials/schedule.html
+++ b/templates/credentials/schedule.html
@@ -51,7 +51,7 @@ <h1 class="p-heading--2">
                   name="timezone"
                   required></select>
           <label class="p-heading--5 u-no-margin" for="exam-date">Select your preferred day</label>
-          <p>You can schedule your exam to begin {{ time_delay }} from now or later.</p>
+          <p>You can schedule your exam to begin {{ time_delay }} from now or later. {{max_date}}</p>
           <input class="spaced-bottom--smaller is-paper--input"
                  type="date"
                  id="exam-date"
diff --git a/webapp/shop/cred/views.py b/webapp/shop/cred/views.py
index 76c5052bf88..3698f8e2960 100644
--- a/webapp/shop/cred/views.py
+++ b/webapp/shop/cred/views.py
@@ -242,10 +242,17 @@ def cred_schedule(
     **_,
 ):
     error = None
+    
+    contract_long_id = flask.request.args.get("contractLongID")
+    contract_detail = ua_contracts_api.get_contract(contract_long_id)
+
     now = datetime.utcnow()
     min_date = (now + timedelta(minutes=30)).strftime("%Y-%m-%d")
-    max_date = (now + timedelta(days=365)).strftime("%Y-%m-%d")
-    contract_long_id = flask.request.args.get("contractLongID")
+    max_date = datetime.strptime(
+                    f"{contract_detail['contractInfo']['effectiveTo']}",
+                    "%Y-%m-%dT%H:%M:%SZ",
+                ).strftime("%Y-%m-%d")
+
     is_staging = "staging" in os.getenv(
         "CONTRACTS_API_URL", "https://contracts.staging.canonical.com/"
     )
@@ -317,7 +324,6 @@ def cred_schedule(
             between the contract effectiveness window"""
             if not contract_long_id:
                 return flask.redirect("/credentials/your-exams")
-            contract_detail = ua_contracts_api.get_contract(contract_long_id)
             effective_from = now.astimezone(tz_info) + timedelta(
                 hours=time_delta
             )