diff --git a/freedoi/resolver/templates/resolver/home.html b/freedoi/resolver/templates/resolver/home.html
index 67710b0..1198898 100644
--- a/freedoi/resolver/templates/resolver/home.html
+++ b/freedoi/resolver/templates/resolver/home.html
@@ -73,10 +73,7 @@
     Ready to get started? Create an account or log in to begin managing your
     DOIs.
   </p>
-  <a class="btn btn-primary" href="{% url 'login' %}">Login</a>
-  <a class="btn btn-secondary" href="{% url 'send_login_email' %}"
-    >Email Login</a
-  >
+  <a class="btn btn-primary" href="{% url 'login' %}">Login or Sign Up</a>
   {% endif %}
 </div>
 
diff --git a/freedoi/resolver/templates/resolver/identifier_list.html b/freedoi/resolver/templates/resolver/identifier_list.html
index ed24cd7..97e4b9e 100644
--- a/freedoi/resolver/templates/resolver/identifier_list.html
+++ b/freedoi/resolver/templates/resolver/identifier_list.html
@@ -1,12 +1,12 @@
 {% extends "base_generic.html" %} {% block title %}Identifiers{% endblock %}
 {% block content %}
 <div class="container mt-5">
-  <h1>Identifiers for {{ suffix.name }}</h1>
+  <h1>Identifiers{% if suffix %} for {{ suffix.name }}{% endif %}</h1>
   <ul class="list-group">
     {% for identifier in object_list %}
     <li class="list-group-item">
       <a
-        href="{% url 'identifier_detail' suffix_pk=suffix.pk pk=identifier.pk %}"
+        href="{% url 'identifier_detail' suffix_pk=identifier.suffix.pk pk=identifier.pk %}"
         >{{ identifier.identifier }}</a
       >
     </li>
@@ -14,7 +14,7 @@
   </ul>
   <a
     class="btn btn-primary mt-3"
-    href="{% url 'identifier_create' suffix_pk=suffix.pk %}"
+    href="{% if suffix.pk %}{% url 'identifier_create' suffix_pk=suffix.pk %}{% else %}{% url 'identifier_create' %}{% endif %}"
     >Create new identifier</a
   >
   <a class="btn btn-link mt-3" href="{% url 'suffix_list' %}"