diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
index c8cebeaf..a9fac424 100644
--- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
+++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
@@ -525,10 +525,15 @@ EOC;
 					$cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_WARNING, "Skipping Let's Encrypt generation for " . $domain . " due to no system known IP address via DNS check");
 					unset($domains[$idx]);
 					// in order to avoid a cron-loop that tries to get a certificate every 5 minutes, we disable let's encrypt for this domain
-					$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `letsencrypt` = '0' WHERE `id` = :did");
-					Database::pexecute($upd_stmt, [
-						'did' => $domain_id
-					]);
+					if ($domain_id > 0) {
+						$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `letsencrypt` = '0' WHERE `id` = :did");
+						Database::pexecute($upd_stmt, [
+							'did' => $domain_id
+						]);
+					} else {
+						// froxlor's hostname
+						Settings::Set('system.le_froxlor_enabled', 0);
+					}
 					$cronlog->logAction(FroxlorLogger::CRON_ACTION, LOG_WARNING, "Let's Encrypt deactivated for domain " . $domain);
 				}
 			}
diff --git a/templates/Froxlor/src/scss/components/_navbar.scss b/templates/Froxlor/src/scss/components/_navbar.scss
index 1ed70f61..7d2a3129 100644
--- a/templates/Froxlor/src/scss/components/_navbar.scss
+++ b/templates/Froxlor/src/scss/components/_navbar.scss
@@ -20,9 +20,6 @@
 }
 
 @include media-breakpoint-down(md) {
-	.form-control-plaintext {
-		color: $white;
-	}
 	.navbar {
 		background: $dark;
 
diff --git a/templates/Froxlor/table/macros.html.twig b/templates/Froxlor/table/macros.html.twig
index 08eff78f..300682ff 100644
--- a/templates/Froxlor/table/macros.html.twig
+++ b/templates/Froxlor/table/macros.html.twig
@@ -44,14 +44,14 @@
 
 {% macro button(data) %}
 	{% apply spaceless %}
-	<a class="{% if data.class is defined %}btn btn-sm {{ data.class }}{% else %}btn btn-sm btn-outline-secondary{% endif %}" {% if data.modal is defined and data.modal is iterable %} data-bs-toggle="modal" role="button" href="#{{ data.modal.id }}" {% else %} href="{{ data.href }}" {% endif %} {% if data.target is defined %} target="{{ data.target }}" {% endif %} {% if data.title is defined %} title="{{ data.title }}" {% endif %}>
+	<{% if data.href is defined %}a{% else %}span{% endif %} class="{% if data.class is defined %}btn btn-sm {{ data.class }}{% else %}btn btn-sm btn-outline-secondary{% endif %}" {% if data.modal is defined and data.modal is iterable %} data-bs-toggle="modal" role="button" href="#{{ data.modal.id }}" {% else %} {% if data.href is defined %}href="{{ data.href }}"{% endif %} {% endif %} {% if data.target is defined %} target="{{ data.target }}" {% endif %} {% if data.title is defined %} title="{{ data.title }}" {% endif %}>
 		{% if data.icon is defined %}
 			<i class="{{ data.icon }}"></i>
 		{% endif %}
 		{% if data.text is defined %}
 			{{ data.text }}
 		{% endif %}
-	</a>
+	</{% if data.href is defined %}a{% else %}span{% endif %}>
 	{% if data.modal is defined and data.modal is iterable %}
 		<div class="modal fade" data-action="{{ data.modal.action|default('') }}" data-entry="{{ data.modal.entry }}" id="{{ data.modal.id }}" aria-hidden="true" aria-labelledby="{{ data.modal.id }}Label" tabindex="-1">
 			<div class="modal-dialog {{ data.modal.size|default('modal-xl') }} modal-dialog-centered">