diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index bce407a..11f8356 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -80,7 +80,7 @@
     <input type="hidden" id="plan_template_id" name="plan[template_id]"></input>
     
     <%= render partial: 'shared/accessible_submit_button',
-               locals: {id: 'create_plan_submit', val: 'Create Plan', disabled_initially: false} %>
+               locals: {id: 'create_plan_submit', val: 'Create Plan', disabled_initially: true} %>
 
   <% end %>
 </div>
diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index fcf38f5..d3a48ec 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -1,9 +1,9 @@
 <input id="<%= id %>" 
        type="submit" 
        class="form-submit" 
-       clickable="<%= disabled_initially %>"
        value="<%= val %>"
-       artia-describedby="<%= id %>_tip" />
+       aria-disabled="<%= disabled_initially %>"
+       aria-describedby="<%= id %>_tip" />
 
 <div role="tooltip" id="<%= id %>_tip" class="submit-tooltip">
   <div class="arrow-left"></div>
@@ -16,7 +16,7 @@
   $(document).ready(function(){
     // Allow the 'button disabled' tooltip to appear if the button is NOT clickable
     $("#<%= id %>").on('click focus', function(e){
-      if($(this).attr('clickable') != 'true'){
+      if($(this).attr('aria-disabled') == 'true'){
         e.preventDefault();
         $("#<%= id %>_tip").attr('role', 'tooltip');
       }else{
diff --git a/lib/assets/javascripts/plans/create_plan.js b/lib/assets/javascripts/plans/create_plan.js
index d1d599b..7bf6e19 100644
--- a/lib/assets/javascripts/plans/create_plan.js
+++ b/lib/assets/javascripts/plans/create_plan.js
@@ -25,7 +25,7 @@
   });
   
   $("#plan_template_id").change(function(){
-    $("#create_plan_submit").attr('clickable', ($(this).val().trim().length > 0));
+    $("#create_plan_submit").attr('aria-disabled', ($(this).val().trim().length <= 0));
   });
 });
 
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index 9a73308..a9ebd9c 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -75,7 +75,7 @@
 input[type="submit"].admin{
   background-color: $primary-admin-color;
 }
-input.form-submit[clickable='false'] {
+input.form-submit[aria-disabled='true'] {
   background-color: $disabled-button-color;
 }
 input.form-submit:focus + [role="tooltip"] {