diff --git a/cp/resources/views/admin/domains/viewApplication.twig b/cp/resources/views/admin/domains/viewApplication.twig
index 47a0160..8b93e54 100644
--- a/cp/resources/views/admin/domains/viewApplication.twig
+++ b/cp/resources/views/admin/domains/viewApplication.twig
@@ -87,18 +87,6 @@
                         <div class="datagrid-content"><strong><a href="/contact/view/{{ contact.identifier }}">{{ contact.identifier }}</a></strong></div>
                       </div>
                     {% endfor %}{% endif %}
-                      <div class="datagrid-item">
-                        <div class="datagrid-title">{{ __('Auth Type') }}</div>
-                        <div class="datagrid-content">
-                        {% if domain.authtype == 'pw' %}
-                          Regular
-                        {% elseif domain.authtype == 'ext' %}
-                          HSM
-                        {% else %}
-                          {{ domain.authtype }} {# Fallback in case there are other types #}
-                        {% endif %}
-                        </div>
-                      </div>
                       <div class="datagrid-item">
                         <div class="datagrid-title">{{ __('Auth Info') }}</div>
                         <div class="datagrid-content blur" id="authInfo" onclick="toggleBlur()">
@@ -114,16 +102,18 @@
                   <div class="card h-100">
                     <div class="card-body">
                       <h5 class="card-title">{{ __('Nameservers') }}</h5>
-                        <div class="datagrid">
-                          {% for host in domainHosts %}
-                          <div class="datagrid-item">
-                            <div class="datagrid-title">{{ __('Nameserver') }} {{ loop.index }}</div>
-                            <div class="datagrid-content">
-                              <strong><a href="/host/view/{{ host.name }}">{{ host.name }}</a></strong>
-                            </div>
+                        {% if domainHosts is not empty %}
+                          <div class="datagrid">
+                            {% for host in domainHosts %}
+                              <div class="datagrid-item">
+                                <div class="datagrid-title">{{ __('Nameserver') }} {{ loop.index }}</div>
+                                <div class="datagrid-content">
+                                  <strong><a href="/host/view/{{ host.name }}">{{ host.name }}</a></strong>
+                                </div>
+                              </div>
+                            {% endfor %}
                           </div>
-                          {% endfor %}
-                        </div>
+                        {% endif %}
                     </div>
                   </div>
                 </div>
diff --git a/cp/resources/views/admin/domains/viewDomain.twig b/cp/resources/views/admin/domains/viewDomain.twig
index 307cafd..624bd13 100644
--- a/cp/resources/views/admin/domains/viewDomain.twig
+++ b/cp/resources/views/admin/domains/viewDomain.twig
@@ -94,18 +94,6 @@
                         <div class="datagrid-content"><strong><a href="/contact/view/{{ contact.identifier }}">{{ contact.identifier }}</a></strong></div>
                       </div>
                     {% endfor %}{% endif %}
-                      <div class="datagrid-item">
-                        <div class="datagrid-title">{{ __('Auth Type') }}</div>
-                        <div class="datagrid-content">
-                        {% if domainAuth.authtype == 'pw' %}
-                          Regular
-                        {% elseif domainAuth.authtype == 'ext' %}
-                          HSM
-                        {% else %}
-                          {{ domainAuth.authtype }} {# Fallback in case there are other types #}
-                        {% endif %}
-                        </div>
-                      </div>
                       <div class="datagrid-item">
                         <div class="datagrid-title">{{ __('Auth Info') }}</div>
                         <div class="datagrid-content blur" id="authInfo" onclick="toggleBlur()">
@@ -121,16 +109,18 @@
                   <div class="card h-100">
                     <div class="card-body">
                       <h5 class="card-title">{{ __('Nameservers') }}</h5>
-                        <div class="datagrid">
-                          {% for host in domainHosts %}
-                          <div class="datagrid-item">
-                            <div class="datagrid-title">{{ __('Nameserver') }} {{ loop.index }}</div>
-                            <div class="datagrid-content">
-                              <strong><a href="/host/view/{{ host.name }}">{{ host.name }}</a></strong>
-                            </div>
+                        {% if domainHosts is not empty %}
+                          <div class="datagrid">
+                            {% for host in domainHosts %}
+                              <div class="datagrid-item">
+                                <div class="datagrid-title">{{ __('Nameserver') }} {{ loop.index }}</div>
+                                <div class="datagrid-content">
+                                  <strong><a href="/host/view/{{ host.name }}">{{ host.name }}</a></strong>
+                                </div>
+                              </div>
+                            {% endfor %}
                           </div>
-                          {% endfor %}
-                        </div>
+                        {% endif %}
                     </div>
                   </div>
                 </div>