diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 10088fcdb6..d83b73aef4 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -1101,7 +1101,7 @@
     });
   });
 
-  define([
+  require([
     "jquery",
     "common/geonames"
   ], function ($, geonames) {
diff --git a/www/scripts/apps/admin/require.config.js b/www/scripts/apps/admin/require.config.js
index 19c3c5e5cb..95e19c32f3 100644
--- a/www/scripts/apps/admin/require.config.js
+++ b/www/scripts/apps/admin/require.config.js
@@ -17,6 +17,7 @@ require.config({
         backbone: "../assets/backbone-amd/backbone",
         "jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",
         "jquery.cookie": "../assets/jquery.cookie/jquery.cookie",
+        "jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames",
         "jquery.treeview": "../assets/jquery.treeview/jquery.treeview",
         "jquery.tooltip": "../include/jquery.tooltip",
         "blueimp.loadimage" : "../assets/blueimp-load-image/load-image",
@@ -37,6 +38,10 @@ require.config({
             deps: ["jquery"],
             exports: '$.fn.cookie'
         },
+        "jquery.geonames": {
+            deps: ["jquery"],
+            exports: '$.fn.geocompleter'
+        },
         "jquery.tooltip": {
             deps: ["jquery"],
             exports: '$.fn.tooltip'
diff --git a/www/scripts/apps/login/home/config.js b/www/scripts/apps/login/home/config.js
index c7019eecd7..dd62d757a9 100644
--- a/www/scripts/apps/login/home/config.js
+++ b/www/scripts/apps/login/home/config.js
@@ -17,7 +17,7 @@ require.config({
         backbone: "../assets/backbone-amd/backbone",
         i18n: "../assets/i18next/i18next.amd-1.6.3",
         bootstrap: "../assets/bootstrap/js/bootstrap.min",
-        multiselect: "../assets/bootstrap-multiselect/dist/js/bootstrap-multiselect",
+        multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
         "jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
     },
     shim: {
diff --git a/www/scripts/common/geonames.js b/www/scripts/common/geonames.js
index 7c1ae63e47..690d098244 100644
--- a/www/scripts/common/geonames.js
+++ b/www/scripts/common/geonames.js
@@ -1,7 +1,7 @@
 ;
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
-        define([''], factory);
+        define(['jquery.geonames'], factory);
     } else {
         root.geonames = factory();
     }