diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 63cef43..71f1e7b 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -37,7 +37,7 @@
         <td class="first"><%= _('Organisation') %></td>
         <td><%= collection_select(:user,
             :org_id, @orgs,
-            :id, :name, {include_blank: constant("organisation_types.organisation")},
+            :id, :name, {include_blank: _('Select Organisation')},
             { class: "typeahead org_sign_up" }) %></td>
       </tr>
       <tr id="other-organisation-name" style="display:none" data-orgs="<%= @other_organisations.join(",") %>">
diff --git a/app/views/plans/_dropdowns_new_plan.html.erb b/app/views/plans/_dropdowns_new_plan.html.erb
index 544d874..1fb8708 100644
--- a/app/views/plans/_dropdowns_new_plan.html.erb
+++ b/app/views/plans/_dropdowns_new_plan.html.erb
@@ -21,7 +21,7 @@
                 :collection => @funders,
                 :label => _('If applying for funding, select your research funder.'),
                 :input_html => { :multiple => false, :class => ["select2", "select2-container"] },
-                :include_blank =>  constant("organisation_types.funder") %>
+                :include_blank =>  _('Select Funder') %>
 
           <div class="div_clear"></div>
         </div>   <!-- funder-control-group -->
diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index b3f6d2e..955b4b5 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -200,7 +200,7 @@
 		<!-- get the funder name if there is one -->
     <%if @plan_data["template"]["org"]["name"].present? %>
 			<tr>
-				<td class="first"><%= constant("organisation_types.funder") %></td>
+				<td class="first"><%= _('Funder') %></td>
 				<td><%= @plan_data["template"]["org"]["name"] %></td>
 			</tr>
 		<%end%>
diff --git a/app/views/projects/_dropdowns_new_project.html.erb b/app/views/projects/_dropdowns_new_project.html.erb
index 87add23..f9a91ce 100644
--- a/app/views/projects/_dropdowns_new_project.html.erb
+++ b/app/views/projects/_dropdowns_new_project.html.erb
@@ -11,7 +11,7 @@
 			<div class="dropdowns">
 				<div class="control-group" id="funder-control-group">
 					<div class="controls">
-						<%= f.input :funder_id, :as => :select, :collection => @funders, :label => _('If applying for funding, select your research funder.'), :input_html => { :multiple => false, :class => ["select2", "select2-container"] }, :include_blank =>  constant("organisation_types.funder") %>
+						<%= f.input :funder_id, :as => :select, :collection => @funders, :label => _('If applying for funding, select your research funder.'), :input_html => { :multiple => false, :class => ["select2", "select2-container"] }, :include_blank =>  _('Select Funder') %>
 
 						<div class="div_clear"></div>
 
@@ -29,7 +29,7 @@
 				</div>
 				<div class="control-group" id="institution-control-group">
 					<div class="controls">
-						<%= f.input :institution_id, :as => :select, :collection => @institutions, :label => _('To see institutional questions and/or guidance, select your organisation.'), :input_html => { :multiple => false, :class => ["select2", "select2-container", "typeahead"] }, :include_blank =>  constant("organisation_types.organisation")  %>
+						<%= f.input :institution_id, :as => :select, :collection => @institutions, :label => _('To see institutional questions and/or guidance, select your organisation.'), :input_html => { :multiple => false, :class => ["select2", "select2-container", "typeahead"] }, :include_blank =>  _('Select Organisation')  %>
 						<div class="div_clear"></div>
 						<div class="move_2_right">
 							<a href='#' id="no-institution"><%= _('Not applicable/not listed.')%></a>
diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
index 335c91e..687600e 100644
--- a/app/views/questions/_show_question.html.erb
+++ b/app/views/questions/_show_question.html.erb
@@ -62,7 +62,7 @@
     </tr>
 
     <!-- Suggested answer or Example-->
-    <% if question.section.phase.template.org.org_type != constant("organisation_types.funder")  %>
+    <% if !question.section.phase.template.org.funder? %>
       <% suggested_answer = question.get_suggested_answer(current_user.org_id) %>
       <% if !suggested_answer.nil?  && suggested_answer.text != ""  %>
         <tr>
diff --git a/config/locale/app.pot b/config/locale/app.pot
index c956af4..ef2a05b 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -2780,3 +2780,9 @@
 #magic_strings.token_permission_types.statistics
 msgid "statistics"
 msgstr ""
+
+msgid "Select Organisation"
+msgstr ""
+
+msgid "Select Funder"
+msgstr ""