diff --git a/app/views/plans/_form_v2.html.erb b/app/views/plans/_form_v2.html.erb
index 92b1bd4..fb31c57 100644
--- a/app/views/plans/_form_v2.html.erb
+++ b/app/views/plans/_form_v2.html.erb
@@ -66,12 +66,11 @@
                             tooltip: _('Please select a valid funding organisation from the list.')} %>
       </div>
 
-      <% cb_display = (params[:debug] == "true" ? "block" : "none") %>
-      <%= check_box_tag(:plan_no_org, '', false, style: "display: #{cb_display};") %>
-      <%= check_box_tag(:plan_no_funder, '', true, style: "display: #{cb_display};") %>
-      <div id="available-templates" style="visibility: none;">
+      <%= check_box_tag(:plan_no_org, '', false, style: 'display: none;') %>
+      <%= check_box_tag(:plan_no_funder, '', true, style: 'display: none;') %>
+      <div id="available-templates" style="display: none;">
         <p>
-          <%= _('Multiple templates where found for this organisation, which one would you like to use ?') %>
+          <%= _('Multiple templates where found, which one would you like to use?') %>
         </p>
         <%= hidden_field_tag 'template-option-target', org_admin_template_options_path %>
         <%= select_tag(
@@ -79,6 +78,13 @@
             @templates, 'id', 'title', @templates.first.id
           )) %>
       </div>
+      <div id="single-template" style="display: none;">
+        <p>
+          <span><%= _('This organisation provides a template. Would you like to create a plan from the') %></span>
+          <span id="single-template-name"></span>
+          <span><%= _('template?') %></span>
+        </p>
+      </div>
 
       <!-- Submit and other buttons -->
       <div class="pull-right">
diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index bd3fc76..c891441 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -39,9 +39,14 @@
         if (data.templates.length === 1) {
           $('#plan_template_id option').attr('selected', 'true');
           $('#multiple-templates').hide();
+          if ($('#plan_org_id').val() !== '-1') {
+            $('#single-template-name').html(data.templates[0].title);
+            $('#single-template').show();
+          }
         } else {
           $('#multiple-templates').show();
           $('#available-templates').fadeIn();
+          $('#single-template').hide();
         }
         toggleSubmit();
       } else {
@@ -122,6 +127,8 @@
     handleCheckboxClick('funder', $('#plan_no_funder').prop('checked'));
   }
 
+  // For form v2
+
   // Clicking on the 'No' button activates the next tabs
   $('#no-btn').click((e) => {
     e.preventDefault();