diff --git a/app/views/plans/new.html.erb b/app/views/plans/new.html.erb
index c2c56be..053feb7 100644
--- a/app/views/plans/new.html.erb
+++ b/app/views/plans/new.html.erb
@@ -11,10 +11,10 @@
 		<fieldset class="white-fieldset">
 			<h3><%= _('Where will the research be conducted?') %></h3>
 			
-			<label for="plan_org_id">
+			<label for="plan_org_name">
 				<%= _('Select the primary research organisation responsible') %>
 			</label>
-			<input type="text" name="plan[org_id]" id="plan_org_id" 
+			<input type="text" name="plan[org_id]" id="plan_org_name" 
 						 class="js-combobox" list="orgs" 
 						 data-combobox-prefix-class="combobox"
 						 data-combobox-case-sensitive="no"
@@ -35,10 +35,10 @@
 		<fieldset class="white-fieldset">
 			<h3><%= _('Who will fund the research?') %></h3>
 			
-			<label for="plan_funder_id">
+			<label for="plan_funder_name">
 				<%= _('Select the funding organisation') %>
 			</label>
-			<input type="text" name="plan[funder_id]" id="plan_funder_id" 
+			<input type="text" name="plan[funder_id]" id="plan_funder_name" 
 						 class="js-combobox" list="funders" 
 						 data-combobox-prefix-class="combobox"
 						 data-combobox-case-sensitive="no"
diff --git a/lib/assets/javascripts/new_plan.js b/lib/assets/javascripts/new_plan.js
index c3aca8c..7a93a01 100644
--- a/lib/assets/javascripts/new_plan.js
+++ b/lib/assets/javascripts/new_plan.js
@@ -2,15 +2,36 @@
 	// Replace the default js-combobox clear button [X] with a fontawesome icon
 	$(".combobox-clear-button").html('<i class="fa fa-times-circle"></i>');
 	
+	// Form submit button is disabled until all requirements are met
+	$(".form-submit").prop("disabled", true);
+	
 	// Function to hide/show the clear button when text changed in the dropdown
-	$(".combobox-container input.js-combobox").keyup(function(e){
+	$(".combobox-container input.js-combobox").keyup(function(){
 		displayClearButton(this);
+		toggleSubmit();
 	});
 	
 	// Initialize the clear buttons on load
-	$(".combobox-container input.js-combobox").each(function(idx){
+	$(".combobox-container input.js-combobox").each(function(){
 		displayClearButton(this);
 	});
+	
+	// Hide the clear button if it gets clicked
+	$(".combobox-clear-button").click(function(){
+		$(this).css("display", 'none');
+	});
+	
+	// If the user clicks the no Organisation checkbox disable the dropdown
+	$("#plan_no_org").click(function(){
+		$("#plan_org_name").prop("disabled", this.checked).val("");
+		toggleSubmit();
+	});
+	
+	// If the user clicks the no Funder checkbox disable the dropdown
+	$("#plan_no_funder").click(function(){
+		$("#plan_funder_name").prop("disabled", this.checked).val("");
+		toggleSubmit();
+	});
 });
 
 function displayClearButton(combobox){
@@ -22,4 +43,16 @@
 	}else{
 		clear.css("display", 'inline');
 	}
+}
+
+// Only display the submit button if the user has made each decision
+function toggleSubmit(){
+	// If the (no_org checkbox is checked OR an org was selected) AND
+	//				(no_funder checkbox is checked OR a funder was selected)
+	var show = ($("#plan_no_org").prop("checked") || 
+							$("#plan_org_name").val().trim().length > 0) &&
+						 ($("#plan_no_funder").prop("checked") || 
+							$("#plan_funder_name").val().trim().length > 0);
+	
+	$(".form-submit").prop("disabled", !show);
 }
\ No newline at end of file
diff --git a/lib/assets/stylesheets/dmproadmap.scss b/lib/assets/stylesheets/dmproadmap.scss
index 42125f9..1850394 100644
--- a/lib/assets/stylesheets/dmproadmap.scss
+++ b/lib/assets/stylesheets/dmproadmap.scss
@@ -3,9 +3,12 @@
 $font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
 
 $white: #FFF;
+
 $primary-color: #F49700;
+$disabled-button-color: #FFE9B3;
 $reverse-text: #FFF;
 
+
 @mixin icon($icon) {
   @extend .fa;
   @extend .fa-#{$icon}:before;
@@ -60,6 +63,9 @@
 			-moz-border-radius: 10px;
 			border-radius: 10px;
 		}
+		input.form-submit:disabled {
+			background-color: $disabled-button-color;
+		}
 		
 	}