diff --git a/app/views/devise/registrations/_personal_details.html.erb b/app/views/devise/registrations/_personal_details.html.erb
index 2cd1eaa..8164089 100644
--- a/app/views/devise/registrations/_personal_details.html.erb
+++ b/app/views/devise/registrations/_personal_details.html.erb
@@ -33,25 +33,7 @@
     <%= f.password_field(:password, class: "form-control", "aria-required": true) %>
   </div>
 
-  <div class="form-group col-xs-8">
-    <%= f.label(:org_name, _('Organisation'), class: 'control-label') %>
-    <%= render partial: "shared/accessible_combobox",
-             locals: {name: "#{resource_name}[org_name]",
-                      id: "#{resource_name}_org_name",
-                      default_selection: @default_org,
-                      models: @orgs,
-                      attribute: 'name'} %>
-
-    <div id='other-org-link'>
-      <a href="#"><%= _("My organisation isn't listed.") %></a>
-    </div>
-
-    <% other_organisations = Org.where("parent_id IS ? AND is_other = ?", nil, true).pluck(:id) %>
-    <div id="other-org-name" style="display: <%= @other_organisations.nil? ? 'block' : 'none' %>" data-orgs="<%= other_organisations.join(',') %>">
-    <%= f.label _('Organisation name'), for: :other_organisation, class: 'control-label' %>
-    <%= f.text_field :other_organisation, :autocomplete => "off", class: "form-control", 'data-toggle' => "tooltip", 'title': _('Please enter the name of your organisation.') %>
-    </div>
-  </div>
+  <%= render partial: "shared/org_dropdown", locals: {f: f, default_org: @default_org, orgs: @orgs, allow_other_orgs: true} %>
 
   <% if MANY_LANGUAGES %>
     <div class="form-group col-xs-8">
diff --git a/app/views/shared/_org_dropdown.html.erb b/app/views/shared/_org_dropdown.html.erb
new file mode 100644
index 0000000..f186af4
--- /dev/null
+++ b/app/views/shared/_org_dropdown.html.erb
@@ -0,0 +1,25 @@
+<% others = allow_other_orgs ||= false %>
+<% left_size = (others ? 5 : 8) %>
+
+<div class="form-group col-md-<%= left_size %>">
+  <%= f.label :org_name, _('Organisation'), class: 'control-label' %>
+  <%= render partial: "shared/accessible_combobox",
+             locals: {name: "user[org_name]",
+                      id: "user_org_name",
+                      default_selection: default_org,
+                      models: orgs,
+                      attribute: 'name'} %>
+
+  <% if others %>
+    <%= f.text_field :other_organisation, autocomplete: "off", class: "form-control hide", 
+                     placeholder: _('Please enter the name of your organisation') %>
+  <% end %>
+</div>
+
+<% if others %>
+  <div class="checkbox col-md-3">
+    <label for="other_orgs_toggle">
+      <input type="checkbox" id="other_orgs_toggle" /><%= _('My organisation isn\'t listed') %>
+    </label>
+  </div>
+<% end %>
diff --git a/lib/assets/javascripts/utils/autoComplete.js b/lib/assets/javascripts/utils/autoComplete.js
index 83376fb..50c3658 100644
--- a/lib/assets/javascripts/utils/autoComplete.js
+++ b/lib/assets/javascripts/utils/autoComplete.js
@@ -52,6 +52,9 @@
       debounced($(el));
     });
 
+    // add a Bootstrap 'hide' class to the invisible help text
+    $('.invisible').addClass('hide');
+
     // Show/hide the clear button on page load
     toggleClearButton(el);