diff --git a/templates/extra.toml b/templates/extra.toml
index 16fbf94..3e2be0b 100644
--- a/templates/extra.toml
+++ b/templates/extra.toml
@@ -12,6 +12,11 @@ stylesheet = "/style.css"
 # favicon_mimetype = "image/png"
 # favicon_mimetype = "image/jpeg"
 
+# Urls to look up v4 and v6 addresses explicitly
+# If you have not configured them, comment them out, the button will stay hidden
+v4_url="http://v4.localhost:3000/"
+v6_url="http://v6.localhost:3000/"
+
 [404]
 # configure the 404 page, this is available for other pages too!
 title = "Nothing here"
diff --git a/templates/index.html b/templates/index.html
index c7f954a..4608fa1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,7 +12,15 @@
 {% block og_path %}/{% endblock %}
 
 {% block other_ip_button %}
-	<!-- TODO -->
+	{% if data.ressult.ip_info.is_v6_address %}
+		{% if extra.v4_url %}
+			<p class="button-paragraph"><a href="{{extra.v4_url}}">Look up your IPv4 address instead <small>(You'll get an error if you live in the future)</small></a></p>
+		{% endif %}
+	{% else %}
+		{% if extra.v6_url %}
+			<p class="button-paragraph"><a href="{{extra.v6_url}}">Look up your IPv6 address instead <small>(You'll get an error if you live in the past)</small></a></p>
+		{% endif %}
+	{% endif %}
 {% endblock %}
 
 {% block extra_content %}
diff --git a/templates/ip.html b/templates/ip.html
index 9fa7fc3..16b64f6 100644
--- a/templates/ip.html
+++ b/templates/ip.html
@@ -24,8 +24,8 @@
 			<dd>AS{{r.asn.asn}}</dd>
 			<dt>AS Name</dt>
 			<dd>{{ r.asn.name }}</dd>
-		</dl>
 		{% endif %}
+		</dl>
 		{% block other_ip_button %}{% endblock %}
 	</section>
 	{% if r.location %}