diff --git a/README.md b/README.md
index 86dc37b..e6c5d64 100644
--- a/README.md
+++ b/README.md
@@ -203,6 +203,12 @@ docker-compose exec get_together python3 manage.py createsuperuser
 
 You can then connect to the container by going to localhost:8000
 
+## Changing name and hostname
+
+If you want to use this software with an own hostname you need to change the site settings:
+
+`./env/bin/python manage.py shell -c "from django.contrib.sites.models import Site; Site.objects.filter(domain='example.com').update(name='My Site', domain='mysite.tld')"`
+
 ## Test Federation
 
 You can import live event data into your "Searchable" table with this command:
diff --git a/get_together/templates/get_together/index.html b/get_together/templates/get_together/index.html
index bf0a577..114c99b 100644
--- a/get_together/templates/get_together/index.html
+++ b/get_together/templates/get_together/index.html
@@ -7,7 +7,9 @@
 
 {% block content %}
     <div class="container">
+{% if settings.GOOGLE_MAPS_API_KEY %}
       <div id="map" class="col-sm-12 mb-2" style="height: 300px;"></div>
+{% endif %}
       <div class="row navbar-inverse bg-inverse mb-3">
             <div class="col-12 navbar-text">
                 <form action="{% url 'home' %}" method="GET">{{search_form}} <input type="submit" value="{% trans "Search" %}" class="btn btn-primary btn-sm"></form>
@@ -167,6 +169,7 @@ <h3>{% trans "Nearby Teams" %}</h3>
 {% endblock %}
 
 {% block javascript %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{settings.GOOGLE_MAPS_API_KEY}}&libraries=places"></script>
 <script src="{% static 'js/markerclusterer.js' %}"></script>
 <script type="text/javascript">
@@ -239,6 +242,7 @@ <h3>{% trans "Nearby Teams" %}</h3>
     html_lng: 0.0
 });
 </script>
+{% endif%}
 
 <script src="{% static 'js/jquery-ui-lookup.js' %}"></script>
 <script type="text/javascript">
diff --git a/get_together/templates/get_together/new_event/add_place.html b/get_together/templates/get_together/new_event/add_place.html
index 7945c32..f59b048 100644
--- a/get_together/templates/get_together/new_event/add_place.html
+++ b/get_together/templates/get_together/new_event/add_place.html
@@ -10,7 +10,9 @@ <h2>{% trans "Choose your meeting place" %}</h2>
             {% csrf_token %}
             <input type="hidden" id="id_id" name="id" value="" />
             {% include "events/place_form.html" %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 	            <div class="fluid-layout" id="place-map"></div>
+{% endif %}
             <br />
             <button type="submit" class="btn btn-primary">{% trans "Add Place" %}</button>
             </form>
@@ -22,6 +24,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
 {% endblock %}
 
 {% block javascript %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{settings.GOOGLE_MAPS_API_KEY}}&libraries=places"></script>
 <script type="text/javascript">
 /*
@@ -202,6 +205,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
     html_lng: $("#id_longitude")
 });
 </script>
+{% endif %}
 
 <script src="{% static 'js/jquery-ui-lookup.js' %}"></script>
 <script type="text/javascript">
diff --git a/get_together/templates/get_together/orgs/show_org.html b/get_together/templates/get_together/orgs/show_org.html
index 5f42cf2..b3fc6ce 100644
--- a/get_together/templates/get_together/orgs/show_org.html
+++ b/get_together/templates/get_together/orgs/show_org.html
@@ -41,9 +41,11 @@ <h2>{% blocktrans with org_name=org.name %}Welcome to {{ org_name }}{% endblockt
                 {% endif %}
             </div>
 
+{% if settings.GOOGLE_MAPS_API_KEY %}
             <div id="map" class="col-sm-12 mb-2" style="height: 300px;">
 
             </div>
+{% endif%}
 
             {% if org.description %}
             <div class="container container-secondary mb-3 gt-usertext">
@@ -116,6 +118,7 @@ <h6 class="mt-0 mb-0"><a href="{% url 'show-team-by-slug' member.slug %}" title=
 {% endblock %}
 
 {% block javascript %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{settings.GOOGLE_MAPS_API_KEY}}&libraries=places"></script>
 <script src="{% static 'js/markerclusterer.js' %}"></script>
 <script type="text/javascript">
@@ -183,6 +186,6 @@ <h6 class="mt-0 mb-0"><a href="{% url 'show-team-by-slug' member.slug %}" title=
     html_lng: 0.0
 });
 </script>
-
+{% endif %}
 
 {% endblock %}
diff --git a/get_together/templates/get_together/places/add_place_to_series.html b/get_together/templates/get_together/places/add_place_to_series.html
index a5d09a2..2dfe587 100644
--- a/get_together/templates/get_together/places/add_place_to_series.html
+++ b/get_together/templates/get_together/places/add_place_to_series.html
@@ -11,7 +11,9 @@ <h2>{% trans "Choose your meeting place" %}</h2>
             {% csrf_token %}
             <input type="hidden" id="id_id" name="id" value="" />
             {% include "events/place_form.html" %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 	            <div class="fluid-layout" id="place-map"></div>
+{% endif %}
             <br />
             <button type="submit" class="btn btn-primary">{% trans "Add Place" %}</button>
             </form>
@@ -23,6 +25,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
 {% endblock %}
 
 {% block javascript %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{settings.GOOGLE_MAPS_API_KEY}}&libraries=places"></script>
 <script type="text/javascript">
 /*
@@ -203,6 +206,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
     html_lng: $("#id_longitude")
 });
 </script>
+{% endif %}
 
 <script src="{% static 'js/jquery-ui-lookup.js' %}"></script>
 <script type="text/javascript">
diff --git a/get_together/templates/get_together/places/create_place.html b/get_together/templates/get_together/places/create_place.html
index 0a67ce5..fca950c 100644
--- a/get_together/templates/get_together/places/create_place.html
+++ b/get_together/templates/get_together/places/create_place.html
@@ -11,7 +11,9 @@ <h2>{% trans "Choose your meeting place" %}</h2>
             {% csrf_token %}
             <input type="hidden" id="id_id" name="id" value="" />
                 {% include "events/place_form.html" %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 	            <div class="fluid-layout" id="place-map"></div>
+{% endif %}
             <br />
             <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
             </form>
@@ -23,6 +25,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
 {% endblock %}
 
 {% block javascript %}
+{% if settings.GOOGLE_MAPS_API_KEY %}
 <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{settings.GOOGLE_MAPS_API_KEY}}&libraries=places"></script>
 <script type="text/javascript">
 /*
@@ -203,6 +206,7 @@ <h2>{% trans "Choose your meeting place" %}</h2>
     html_lng: $("#id_longitude")
 });
 </script>
+{% endif %}
 
 <script src="{% static 'js/jquery-ui-lookup.js' %}"></script>
 <script type="text/javascript">
diff --git a/get_together/templates/get_together/places/show_place.html b/get_together/templates/get_together/places/show_place.html
index c04d26c..b802e18 100644
--- a/get_together/templates/get_together/places/show_place.html
+++ b/get_together/templates/get_together/places/show_place.html
@@ -37,6 +37,7 @@ <h2>{{ place.name }}
             </tr>
             </table>
 
+{% if settings.GOOGLE_MAPS_API_KEY %}
         <iframe
             width="720"
             height="400"
@@ -44,6 +45,7 @@ <h2>{{ place.name }}
             src="https://www.google.com/maps/embed/v1/place?key={{ settings.GOOGLE_MAPS_API_KEY }}&q={{place.name|urlencode}}%2C%20{{place.address|urlencode}}&zoom=17"
             allowfullscreen>
         </iframe>
+{% endif %}
 
         </div>