diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index fc968ff..f7edc1f 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -404,7 +404,7 @@
     # If no templates were available use the generic templates
     if @templates.empty?
       @msg = _("Using the generic Data Management Plan")
-      @templates << Template.find_by(is_default: true)
+      @templates << Template.where(is_default: true, published: true).first
     end
 
     @templates = @templates.sort{|x,y| x.title <=> y.title } if @templates.count > 1
diff --git a/app/views/guidance_groups/admin_edit.html.erb b/app/views/guidance_groups/admin_edit.html.erb
index a68ab68..4e9b870 100644
--- a/app/views/guidance_groups/admin_edit.html.erb
+++ b/app/views/guidance_groups/admin_edit.html.erb
@@ -33,20 +33,17 @@
               </div>
             </td>
           </tr>
-          <!-- if guidance group published then display check_box -->
-          <% if @guidance_group.published == true then %>
-              <tr>
-                <td class="first"><%= _('Published') %></td>
-                <td>
-                  <div class="div_left_icon_g">
-                    <%= f.check_box :published %>
-                  </div>
-                  <div class="div_right_icon_g">
-                    <!--%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => _('If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.'))%-->
-                  </div>
-                </td>
-              </tr>
-          <% end %>
+          <tr>
+            <td class="first"><%= _('Published') %></td>
+            <td>
+              <div class="div_left_icon_g">
+                <%= f.check_box :published %>
+              </div>
+              <div class="div_right_icon_g">
+                <!--%= link_to( image_tag('help_button.png'), '#', :class => 'guidance_group_subset_popover', :rel => "popover", 'data-html' => "true", 'data-content' => _('If the guidance is only meant for a subset of users e.g. those in a specific college or institute, check this box.  Users will be able to select to display this subset guidance when answering questions in the 'create plan' wizard.'))%-->
+              </div>
+            </td>
+          </tr>
 
           <tr>
             <td class="first"><%= _('Optional subset') %></td>