diff --git a/sahana/srv/sahana/applications/eden/modules/templates/Spotter/config.py b/sahana/srv/sahana/applications/eden/modules/templates/Spotter/config.py
index 2feefc8..00127fa 100644
--- a/sahana/srv/sahana/applications/eden/modules/templates/Spotter/config.py
+++ b/sahana/srv/sahana/applications/eden/modules/templates/Spotter/config.py
@@ -303,7 +303,7 @@ def config(settings):
     # Uncomment to include WKT in XML exports
     #settings.gis.xml_wkt = True
     # GeoNames username
-    settings.gis.geonames_username = "eden_test"
+    settings.gis.geonames_username = "trendspotter"
 
     # Messaging Settings
     # If you wish to use a parser.py in another folder than "default"
diff --git a/sambro/srv/sambro/applications/eden/modules/templates/SAMBRO/config.py b/sambro/srv/sambro/applications/eden/modules/templates/SAMBRO/config.py
index a94f28b..a456b33 100644
--- a/sambro/srv/sambro/applications/eden/modules/templates/SAMBRO/config.py
+++ b/sambro/srv/sambro/applications/eden/modules/templates/SAMBRO/config.py
@@ -37,7 +37,7 @@ def config(settings):
     settings.auth.registration_requests_organisation = True
 
     # GeoNames username
-    settings.gis.geonames_username = "eden_test"
+    settings.gis.geonames_username = "trendspotter"
 
     # =========================================================================
     # System Settings