diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig
index be12ea2e85..a933840e04 100644
--- a/templates/web/account/account.html.twig
+++ b/templates/web/account/account.html.twig
@@ -6,16 +6,16 @@
 
 {% block stylesheet %}
     {{ parent() }}
-    <link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/geonames/geonames.css' }) }}">
+    {#<link rel="stylesheet" type="text/css" href="{{ path('minifier', { 'f' : 'skins/geonames/geonames.css' }) }}">#}
 {% endblock %}
 
 {% block javascript %}
     {{ parent() }}
-    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : '/skins/account/account.js,assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
+    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : '/skins/account/account.js,assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
     <script type="text/javascript">
         $(document).ready(function() {
             var geocompleter = geonames.init($("#form_geonameid"), {
-                "server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
+                "server": "{{ app['geonames.server-uri'] }}",
                 "limit": 40
             });
 
@@ -105,7 +105,7 @@
                         <div class="control-group">
                             <label class="form_label control-label" for="form_city"><strong>{% trans "admin::compte-utilisateur ville" %}</strong></label>
                             <div class="controls">
-                                <input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="" />
+                                <input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="{{ app["authentication"].getUser().get_geonameid() }}" />
                                 <p class="form_alert help-block"></p>
                             </div>
                         </div>
diff --git a/templates/web/account/base.html.twig b/templates/web/account/base.html.twig
index 14341c611c..4c292e5de8 100644
--- a/templates/web/account/base.html.twig
+++ b/templates/web/account/base.html.twig
@@ -1,4 +1,5 @@
 {% set jquery_theme = 'dark-hive' %}
+{% set module = '' %}
 
 {% extends "common/index_bootstrap.html.twig" %}
 
diff --git a/templates/web/admin/editusers.html.twig b/templates/web/admin/editusers.html.twig
index 4ded35dbdf..1248f4b0b6 100644
--- a/templates/web/admin/editusers.html.twig
+++ b/templates/web/admin/editusers.html.twig
@@ -563,20 +563,20 @@
   </div>
 </div>
 
-<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
+<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
 <script type="text/javascript">
   $(document).ready(function(){
     ini_edit_usrs();
 
     geonames.init($('#user_infos_tab input.geoname_field'), {
-        "server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
+        "server": "{{ app['geonames.server-uri'] }}",
         "limit": 40
     });
 
     $('div.tabs').tabs();
 
     $('#users_rights_form button#reset_rights').bind('click', function(){
-        if(confirm("{% trans'are you sure you want reset rights ?' %}"))
+        if(confirm("{% trans'Are you sure you want to reset rights?' %}"))
         {
           var users = $('#users_rights_form input[name="users"]').val();
 
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index 8492f66373..9aa9f900ea 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -63,7 +63,7 @@
 {% macro choose_title(id, choose_export_title, default_export_title)%}
     <div class="buttons_line" style="display:{% if choose_export_title %}{% else %}none{% endif %}; text-align: left;">
         <p>{% trans 'Nom des fichiers a l\'export'%}</p>
-        <div classe="well-small">
+        <div class="well-small">
             <label for="type_{{id}}_original" class="radio">
                 <input type="radio" name="type" id="type_{{id}}_original" {% if default_export_title == "title" %}checked{% endif %} value="title" />
                 {% trans 'export::titre: titre du documument' %}
@@ -498,7 +498,7 @@
         {% endif %}
     </div>
 
-    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
+    <script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
     <script type="text/javascript">
 
         function check_TOU(container)
@@ -615,7 +615,7 @@
             });
 
             geonames.init($('#command_geoname_field'), {
-                "server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
+                "server": "{{ app['geonames.server-uri'] }}",
                 "limit": 40
             });
 
diff --git a/templates/web/login/register-classic.html.twig b/templates/web/login/register-classic.html.twig
index b3c811343e..5ca30258e8 100644
--- a/templates/web/login/register-classic.html.twig
+++ b/templates/web/login/register-classic.html.twig
@@ -30,7 +30,7 @@
                      name="registerForm"
                      method="POST"
                      action="{{ path("login_register_classic") }}"
-                     data-geonames-server-adress="{{ app['phraseanet.registry'].get('GV_i18n_service') }}"
+                     data-geonames-server-adress="{{ app['geonames.server-uri'] }}"
                 >
                     {% if form.vars.errors|length > 0 %}
                         <div class="row-fluid">
diff --git a/templates/web/prod/User/Add.html.twig b/templates/web/prod/User/Add.html.twig
index 09badfcca0..63f1950aeb 100644
--- a/templates/web/prod/User/Add.html.twig
+++ b/templates/web/prod/User/Add.html.twig
@@ -61,11 +61,11 @@
     </form>
 </div>
 
-<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,skins/geonames/geonames.js' }) }}"></script>
+<script type="text/javascript" language="javascript" src="{{ path('minifier', { 'f' : 'assets/geonames-server-jquery-plugin/jquery.geonames.js,scripts/common/geonames.js' }) }}"></script>
 <script type="text/javascript">
     $(document).ready(function() {
         geonames.init($('#QuickAddUser input.geoname_field'), {
-            "server": "{{ app['phraseanet.registry'].get('GV_i18n_service') }}",
+            "server": "{{ app['geonames.server-uri'] }}",
             "limit": 40
         });
 
diff --git a/templates/web/prod/index.html.twig b/templates/web/prod/index.html.twig
index 1f2eca3896..900774fee5 100644
--- a/templates/web/prod/index.html.twig
+++ b/templates/web/prod/index.html.twig
@@ -79,7 +79,7 @@
         .ui-tabs-vertical .ui-tabs-panel { padding: 1em; float: right;}
     </style>
 
-    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,skins/geonames/geonames.css,include/jquery.image_enhancer.css' }) }}" >
+    <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery.contextmenu.css,include/jslibs/colorpicker/css/colorpicker.css,include/jslibs/jquery-treeview/jquery.treeview.css,skins/common/main.css,include/jquery.image_enhancer.css' }) }}" >
     <link id="skinCss" type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'skins/prod/' ~ cssfile ~ '/prodcolor.css' }) }}" >
     <link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'assets/humane-js/themes/libnotify.css,skins/prod/Prod.css,skins/prod/Basket.css,skins/prod/Push.css' }) }}" >
 
diff --git a/www/scripts/apps/login/home/config.js b/www/scripts/apps/login/home/config.js
index 48a0e83478..cc46c744cf 100644
--- a/www/scripts/apps/login/home/config.js
+++ b/www/scripts/apps/login/home/config.js
@@ -18,8 +18,7 @@ require.config({
         i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
         bootstrap: "../skins/build/bootstrap/js/bootstrap.min",
         multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
-        "jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames",
-        geonames: "../skins/geonames/geonames"
+        "jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
     },
     shim: {
         bootstrap : ["jquery"],
diff --git a/www/scripts/apps/login/home/register.js b/www/scripts/apps/login/home/register.js
index efa33aaeba..345e92716c 100644
--- a/www/scripts/apps/login/home/register.js
+++ b/www/scripts/apps/login/home/register.js
@@ -13,7 +13,7 @@ require([
     "i18n",
     "apps/login/home/common",
     "common/forms/views/formType/passwordSetter",
-    "geonames"
+    "common/geonames"
 ], function($, i18n, Common, RegisterForm, geonames) {
     var fieldsConfiguration = [];
 
diff --git a/www/skins/geonames/geonames.js b/www/scripts/common/geonames.js
similarity index 95%
rename from www/skins/geonames/geonames.js
rename to www/scripts/common/geonames.js
index 8208191745..78f55cc8d4 100644
--- a/www/skins/geonames/geonames.js
+++ b/www/scripts/common/geonames.js
@@ -1,4 +1,4 @@
-(function (root, factory) {
+;(function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         define([''], factory);
     } else {
@@ -9,7 +9,9 @@
         init: function($field, options) {
             var geocompleter = $field.geocompleter(options);
 
+            var geonameId = $field.val();
 
+            
             // On focus add select-state
             geocompleter.geocompleter("autocompleter", "on", "autocompletefocus", function(event, ui) {
                 $("li", $(event.originalEvent.target)).closest("li").removeClass("selected");
diff --git a/www/skins/geonames/geonames.css b/www/skins/geonames/geonames.css
deleted file mode 100644
index 4ae8f402f0..0000000000
--- a/www/skins/geonames/geonames.css
+++ /dev/null
@@ -1,52 +0,0 @@
-
-.geocompleter-menu {
-    max-height: 180px;
-    overflow: auto;
-    background: #666;
-     box-shadow: 0 0 15px rgba(0, 0, 0, 1);
-    -webkit-box-shadow: 0 0 15px rgba(0, 0, 0, 1);
-    -moz-box-shadow: 0 0 15px rgba(0, 0, 0, 1);
-    list-style-type: none;
-}
-
-.geocompleter-menu li.ui-menu-item.selected {
-    border: 2px solid #46a546;
-}
-
-.geocompleter-menu .ui-menu-item a {
-    color: #fff;
-}
-
-.geocompleter-menu .ui-menu-item a.ui-state-focus,
-.geocompleter-menu .ui-menu-item a.ui-state-hover,
-.geocompleter-menu .ui-menu-item a.ui-state-active {
-    text-decoration: none;
-    background: none;
-    border:none;
-}
-
-.geocompleter-menu .ui-menu-item {
-     padding: 5px 10px;
-}
-
-.geocompleter-menu .ui-menu-item:nth-child(odd) {
-     background: #444444;
-}
-
-.geocompleter-menu .region {
-    font-size:  11px;
-    font-style: italic;
-    display: block;
-}
-
-.geocompleter-menu .highlight {
-    background: #46a546;
-}
-
-.geocompleter-input.input-loading {
-    background: url('/skins/icons/loaderFFF.gif') center right no-repeat;
-}
-
-.geocompleter-input.input-error {
-    color: red !important;
-}
\ No newline at end of file