diff --git a/app/models/org.rb b/app/models/org.rb
index 2a75797..a013eff 100644
--- a/app/models/org.rb
+++ b/app/models/org.rb
@@ -92,7 +92,7 @@
   # defaults to none if no org type present
   #
   # @return [String]
-  def type
+  def org_type_to_s
     ret = []
     ret << "Institution" if self.institution?
     ret << "Funder" if self.funder?
diff --git a/app/policies/org_policy.rb b/app/policies/org_policy.rb
index 039c40d..46fa09c 100644
--- a/app/policies/org_policy.rb
+++ b/app/policies/org_policy.rb
@@ -12,7 +12,6 @@
   end
 
   def admin_edit?
-puts "WTF!? #{user.can_modify_org_details?} #{user.org_id} == #{org.id}"
     user.can_modify_org_details? && (user.org_id == org.id || user.can_super_admin?)
   end
 
diff --git a/app/views/orgs/_profile_form.html.erb b/app/views/orgs/_profile_form.html.erb
index abadea8..1dc27d1 100644
--- a/app/views/orgs/_profile_form.html.erb
+++ b/app/views/orgs/_profile_form.html.erb
@@ -96,7 +96,7 @@
     <% else %>
       <dl>
         <dt><%= _('Organisation type(s)') %></dt>
-        <dd><%= org.type %></dd>
+        <dd><%= org.org_type_to_s %></dd>
       </dl>
     <% end %>
   </div>
diff --git a/app/views/paginable/orgs/_index.html.erb b/app/views/paginable/orgs/_index.html.erb
index b4aae61..9adb0c3 100644
--- a/app/views/paginable/orgs/_index.html.erb
+++ b/app/views/paginable/orgs/_index.html.erb
@@ -14,16 +14,8 @@
         <tr>
           <td><%= org.name %></td>
           <td><%= org.contact_email %></td>
-          <td>
-            <% types = [] %>
-            <% types << _('Organisation') if org.organisation? %>
-            <% types << _('Funder') if org.funder? %>
-            <% types << _('Institution') if org.institution? %>
-            <%= (types.length > 0 ? types.join(', ') : 'None') %>
-          </td>
-          <td>
-            <%= org.templates.collect(&:dmptemplate_id).uniq.length %>
-          </td>
+          <td><%= org.org_type_to_s %></td>
+          <td><%= org.templates.collect(&:dmptemplate_id).uniq.length %></td>
           <td>
             <div class="dropdown">
               <button
diff --git a/test/unit/org_test.rb b/test/unit/org_test.rb
index de7d173..40720a3 100644
--- a/test/unit/org_test.rb
+++ b/test/unit/org_test.rb
@@ -35,30 +35,34 @@
   # ---------------------------------------------------
   test "type returns the correct value" do
     @org.institution = true
-    assert_equal "Institution", @org.type
+    assert_equal "Institution", @org.org_type_to_s
     
     @org.institution = false
     @org.funder = true
-    assert_equal "Funder", @org.type
+    assert_equal "Funder", @org.org_type_to_s
     
     @org.funder = false
     @org.organisation = true
-    assert_equal "Organisation", @org.type
+    assert_equal "Organisation", @org.org_type_to_s
     
     @org.organisation = false
     @org.research_institute = true
-    assert_equal "Research Institute", @org.type
+    assert_equal "Research Institute", @org.org_type_to_s
     
     @org.research_institute = false
     @org.project = true
-    assert_equal "Project", @org.type
+    assert_equal "Project", @org.org_type_to_s
     
     @org.project = false
     @org.school = true
-    assert_equal "School", @org.type
+    assert_equal "School", @org.org_type_to_s
     
     @org.school = false
-    assert_equal "None", @org.type
+    assert_equal "None", @org.org_type_to_s
+    
+    @org.funder = true
+    @org.organisation = true
+    assert_equal "Funder, Organisation", @org.org_type_to_s
   end
   
   # ---------------------------------------------------