diff --git a/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/config.py b/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/config.py
index 1807160..02048e6 100644
--- a/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/config.py
+++ b/sahana-spotter/image.d/srv/web2py/applications/eden/modules/templates/Spotter/config.py
@@ -51,13 +51,13 @@ def config(settings):
                                                "volunteer": T("Volunteer"),
                                                "member": T("Member"),
                                                }
-    settings.auth.registration_link_user_to_default = ["staff"]
+    settings.auth.registration_link_user_to_default = ["volunteer"]
 
     # Always notify the approver of a new (verified) user, even if the user is automatically approved
     #settings.auth.always_notify_approver = False
 
     # Uncomment this to request the Home Phone when a user registers
-    settings.auth.registration_requests_home_phone = True
+    # settings.auth.registration_requests_home_phone = True
     # Uncomment this to request the Mobile Phone when a user registers
     settings.auth.registration_requests_mobile_phone = True
     # Uncomment this to have the Mobile Phone selection during registration be mandatory
@@ -71,9 +71,9 @@ def config(settings):
     # Uncomment this to have the Organisation input hidden unless the user enters a non-whitelisted domain
     #settings.auth.registration_organisation_hidden = True
     # Uncomment this to default the Organisation during registration
-    settings.auth.registration_organisation_default = "My Organisation"
+    settings.auth.registration_organisation_default = "TrendSpotter"
     # Uncomment this to request the Organisation Group when a user registers
-    #settings.auth.registration_requests_organisation_group = True
+    settings.auth.registration_requests_organisation_group = True
     # Uncomment this to have the Organisation Group selection during registration be mandatory
     #settings.auth.registration_organisation_group_required = True
     # Uncomment this to request the Site when a user registers
@@ -116,7 +116,7 @@ def config(settings):
     # Uncomment this to allow users to Login using Office365's SMTP
     #settings.auth.office365_domains = ["microsoft.com"]
     # Uncomment this to allow users to Login using OpenID
-    #settings.auth.openid = True
+    settings.auth.openid = True
     # Uncomment this to allow users to login using master key
     #settings.auth.masterkey = True
     # Uncomment this to block password changes since managed externally (OpenID / SMTP / LDAP)
@@ -163,15 +163,15 @@ def config(settings):
     # Make last name in person/user records mandatory
     settings.L10n.mandatory_lastname = True
     # Configure the list of Religions
-    settings.L10n.religions = {"none": T("none"),
-                            "christian": T("Christian"),
-                            "muslim": T("Muslim"),
-                            "jewish": T("Jewish"),
-                            "buddhist": T("Buddhist"),
-                            "hindu": T("Hindu"),
-                            "bahai": T("Bahai"),
-                            "other": T("other")
-                            }
+    # settings.L10n.religions = {"none": T("none"),
+    #                         "christian": T("Christian"),
+    #                         "muslim": T("Muslim"),
+    #                         "jewish": T("Jewish"),
+    #                         "buddhist": T("Buddhist"),
+    #                         "hindu": T("Hindu"),
+    #                         "bahai": T("Bahai"),
+    #                         "other": T("other")
+    #                         }
     # Uncomment this to Translate CMS Series Names
     #settings.L10n.translate_cms_series = True
     # Uncomment this to Translate Layer Names
@@ -191,9 +191,10 @@ def config(settings):
     settings.fin.currencies = {
         "BTC" : "BitCoin",
         "CZK" : "Czech Koruna",
-        "EUR" : "Euros",
+        "EUR" : "Euro",
         "GBP" : "Great British Pounds",
         "USD" : "United States Dollars",
+        "CHF" : "Switzerland franc",
     }
     settings.fin.currency_default = "CZK"
     #settings.fin.currency_writable = False # False currently breaks things
@@ -220,7 +221,7 @@ def config(settings):
     # Restrict the Location Selector to just certain countries
     # NB This can also be over-ridden for specific contexts later
     # e.g. Activities filtered to those of parent Project
-    #settings.gis.countries = ("US",)
+    settings.gis.countries = ("CZ","UA")
     # Uncomment to pass Addresses imported from CSV to a Geocoder to try and automate Lat/Lon
     settings.gis.geocode_imported_addresses = "google"
     # Hide the Map-based selection tool in the Location Selector
@@ -384,9 +385,9 @@ def config(settings):
     #settings.ui.filter_auto_submit = 800
     #settings.ui.report_auto_submit = 800
     # Enable this for a UN-style deployment
-    #settings.ui.cluster = True
+    settings.ui.cluster = True
     # Enable this to use the label 'Camp' instead of 'Shelter'
-    #settings.ui.camp = True
+    settings.ui.camp = True
     # Enable this to have Open links in IFrames open a full page in a new tab
     settings.ui.iframe_opens_full = True
     # Enable this to change the label for 'Attachments' tabs
@@ -694,8 +695,8 @@ def config(settings):
     # Make Facility Types Hierarchical
     settings.org.facility_types_hierarchical = True
     # Enable the use of Organisation Groups & what their name is
-    #settings.org.groups = "Coalition"
-    #settings.org.groups = "Network"
+    # settings.org.groups = "Coalition"
+    # settings.org.groups = "Network"
     # Organisation Location context
     settings.org.organisation_location_context = "organisation_location.location_id"
     # Make Organisation Types Hierarchical
@@ -1011,7 +1012,7 @@ def config(settings):
     # -------------------------------------------------------------------------
     # Transport
     # Uncomment to make Airport codes unique
-    #settings.transport.airport_code_unique = True
+    settings.transport.airport_code_unique = True
     # Uncomment to make Seaport codes unique
     #settings.transport.seaport_code_unique = True
     # Uncomment to make Heliport codes unique