diff --git a/nsupdate/main/templates/main/domain.html b/nsupdate/main/templates/main/domain.html
index 02768b8..00f46cd 100644
--- a/nsupdate/main/templates/main/domain.html
+++ b/nsupdate/main/templates/main/domain.html
@@ -18,16 +18,17 @@
             </form>
         </div>
         <div class="col-lg-4">
-            <h3>Generate New Secret</h3>
+            <h3>Show Configuration</h3>
             <p>
-                You can generate a new shared secret here and we'll show you an updated example config.
+                We'll generate a ready-to-use configuration for your name server,
+                filled out with all values (including a new secret).
             </p>
             <p class="text-warning">
                 We'll create a new shared secret - if you had one before, it will become invalid.
-                You have to put the new secret into your nameserver config.
+                You have to use the new secret in your name server configuration.
             </p>
             <form action="{% url 'generate_ns_secret_view' domain.pk %}" method="get">
-                <button type="submit" class="btn btn-primary btn-warning">Generate New</button>
+                <button type="submit" class="btn btn-primary btn-warning">Show Configuration</button>
             </form>
             <h3>Delete Domain</h3>
             <p class="text-danger">
diff --git a/nsupdate/main/templates/main/host.html b/nsupdate/main/templates/main/host.html
index bacf022..cc3c805 100644
--- a/nsupdate/main/templates/main/host.html
+++ b/nsupdate/main/templates/main/host.html
@@ -20,28 +20,18 @@
             </form>
         </div>
         <div  class="col-lg-4">
-            <h3>Show Configurations</h3>
+            <h3>Show Configuration</h3>
             <p>
                 We'll generate a ready-to-use configuration for your router / update
-                client, filled out with all values.
+                client, filled out with all values (including a new secret).
             </p>
             <p class="text-warning">
                 We'll create a new secret - if you had one before, it will become invalid.
+                You have to use the new secret in your router / update client configuration.
             </p>
             <form action="{% url 'generate_secret_view' host.pk %}" method="get">
                 <button type="submit" class="btn btn-primary btn-warning">Show Configuration</button>
             </form>
-            <h3>Generate New Secret</h3>
-            <p>
-                We store your update secret salted and hashed, so if you forget or lose it
-                you will have to create a new one.
-            </p>
-            <p class="text-warning">
-                We'll create a new secret - if you had one before, it will become invalid.
-            </p>
-            <form action="{% url 'generate_secret_view' host.pk %}" method="get">
-                <button type="submit" class="btn btn-primary btn-warning">Generate New</button>
-            </form>
             <h3>Update other Services</h3>
             <p>We can send updates to other services when we receive an update from you.</p>
             <form action="{% url 'updater_hostconfig_overview' host.pk %}" method="get">