diff --git a/lib/assets/javascripts/views/shared/create_account_form.js b/lib/assets/javascripts/views/shared/create_account_form.js
index 2ebc1b6..fe57717 100644
--- a/lib/assets/javascripts/views/shared/create_account_form.js
+++ b/lib/assets/javascripts/views/shared/create_account_form.js
@@ -1,19 +1,16 @@
 import ariatiseForm from '../../utils/ariatiseForm';
 import { togglisePasswords } from '../../utils/passwordHelper';
-import initMyOrgCombobox from '../shared/my_org';
+import validateOrgSelection from '../shared/my_org';
 import { isValidText } from '../../utils/isValidInputType';
 
 $(() => {
   const options = { selector: '#create-account-form' };
-  initMyOrgCombobox(options);
   ariatiseForm(options);
   togglisePasswords(options);
 
   $('#create_account_form').on('submit', (e) => {
     // Additional validation to force the user to choose an org or type something for other
-    const orgId = $('[name="user[org_id]"]');
-    const otherOrg = $('[name="user[other_organisation]"]');
-    if (isValidText(orgId.val()) || isValidText(otherOrg.val())) {
+    if (validateOrgSelection()) {
       $('#help-org').hide();
     } else {
       e.preventDefault();
diff --git a/lib/assets/javascripts/views/shared/my_org.js b/lib/assets/javascripts/views/shared/my_org.js
index 05efddf..eb85336 100644
--- a/lib/assets/javascripts/views/shared/my_org.js
+++ b/lib/assets/javascripts/views/shared/my_org.js
@@ -51,3 +51,10 @@
     }
   }
 };
+
+export const validateOrgSelection = () => {
+  const orgId = $('[name="user[org_id]"]');
+  const otherOrg = $('[name="user[other_organisation]"]');
+
+  return isValidText(orgId.val()) || isValidText(otherOrg.val());
+};