diff --git a/pinaxcon/templates/flatpages/proposals.html b/pinaxcon/templates/flatpages/proposals.html
index ea701349..18d78f42 100644
--- a/pinaxcon/templates/flatpages/proposals.html
+++ b/pinaxcon/templates/flatpages/proposals.html
@@ -6,7 +6,12 @@
   <div class="col-12 col-md-10 content text-page">
     <h1 style="text-transform: uppercase;">Call <br />for Papers</h1>
     
-    <a class="btn btn-block btn-secondary text-primary" href="/dashboard/">Submit a proposal now!</a>
+    <div class="alert alert-warning">
+      <h3>Call for Papers closed</h3>
+      <strong>Our call for papers has closed on 30 July 2018.</strong><br />
+        We are working hard to review all proposals as soon as possible and
+        create our final conference schedule.
+    </div>
     
     <h2>Important Information</h2>
     <ul>
diff --git a/pinaxcon/templates/symposion/dashboard/speaking.html b/pinaxcon/templates/symposion/dashboard/speaking.html
index ee9454b2..5ccf567f 100644
--- a/pinaxcon/templates/symposion/dashboard/speaking.html
+++ b/pinaxcon/templates/symposion/dashboard/speaking.html
@@ -7,7 +7,7 @@
 </div>
 
 <div class="row">
-  {% if user.speaker_profile %}
+  {% if user.speaker_profile and proposal_kinds %}
   <div class="col-md-6 text-primary d-flex flex-column">
     {% include "symposion/dashboard/_new_proposal.html" %}
   </div>