diff --git a/app/views/shared/_accessible_submit_button.html.erb b/app/views/shared/_accessible_submit_button.html.erb
index 9e08141..9a7f740 100644
--- a/app/views/shared/_accessible_submit_button.html.erb
+++ b/app/views/shared/_accessible_submit_button.html.erb
@@ -1,8 +1,8 @@
 <input id="<%= id %>" 
        type="submit" 
        class="form-submit" 
-       clickable="<%= disabled_initially %>"
        value="<%= val %>"
+       aria-disabled="<%= !disabled_initially %>"
        aria-describedby="<%= id %>_tip" />
 
 <div role="tooltip" id="<%= id %>_tip" class="submit-tooltip">
@@ -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 4e3a652..8395a85 100644
--- a/lib/assets/javascripts/plans/create_plan.js
+++ b/lib/assets/javascripts/plans/create_plan.js
@@ -36,7 +36,8 @@
                   $("#plan_funder_id").val().trim().length > 0);
   
   if(retrieve){
-    $("#create_plan_submit").attr('clickable', 'true');
+//    $("#create_plan_submit").attr('clickable', 'true');
+    $("#create_plan_submit").attr('aria-disabled', 'false');
    // $(".form-submit").prop('disabled', false).prop("aria-disabled", false);
     
     // If the templates section isn't available then submit the form to find the template options
@@ -50,7 +51,8 @@
     $("#available-templates").fadeOut();
     $("#plan_template_id").val("");
     
-    $("#create_plan_submit").attr('clickable', 'false');
+//    $("#create_plan_submit").attr('clickable', 'false');
+    $("#create_plan_submit").attr('aria-disabled', 'true');
     //$(".form-submit").prop('disabled', true).prop("aria-disabled", true);
   }
 }
@@ -65,7 +67,8 @@
     $("#plan_" + name + "_id").val("").change();
     $("#plan_" + name + "_name").siblings(".combobox-clear-button").hide();
   }else{
-    $("#create_plan_submit").attr('clickable', 'false');
+//    $("#create_plan_submit").attr('clickable', 'false'); 
+    $("#create_plan_submit").attr('aria-disabled', 'true');
     //$(".form-submit").prop('disabled', true).prop("aria-disabled", true);
   }
 }
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index cc5eeef..7d26a95 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -85,7 +85,7 @@
       -moz-border-radius: 10px;
       border-radius: 10px;
     }
-    input.form-submit[clickable='false'] {
+    input.form-submit[aria-disabled='true'] {
       background-color: $disabled-button-color;
     }