diff --git a/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc b/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
index de08064e8..4ec83351d 100644
--- a/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
+++ b/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
@@ -57,15 +57,14 @@ function acmeclient_firewall($fw)
  */
 function acmeclient_services()
 {
-    if (!acmeclient_enabled()) {
-        return;
-    }
-
-    global $config;
     $services = array();
 
+    if (!acmeclient_enabled()) {
+        return $services;
+    }
+
     $services[] = array(
-        'description' => gettext('Secure Lets Encrypt client'),
+        'description' => gettext('Let\'s Encrypt client'),
         'configd' => array(
             'restart' => array('acme-http-challenge restart'),
             'start' => array('acme-http-challenge start'),
@@ -89,7 +88,7 @@ function acmeclient_xmlrpc_sync()
     $result = array();
     $result['id'] = 'acmeclient';
     $result['section'] = 'OPNsense.acmeclient';
-    $result['description'] = gettext('Lets Encrypt Client');
+    $result['description'] = gettext('Let\'s Encrypt client');
     return array($result);
 }
  */
diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-rc-script b/security/acme-client/src/etc/rc.d/acme_http_challenge
similarity index 100%
rename from security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-rc-script
rename to security/acme-client/src/etc/rc.d/acme_http_challenge
diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
index 2962c764a..807b5a740 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/certhelper.php
@@ -820,7 +820,7 @@ function import_certificate($certObj, $modelObj)
 
     // Write changes to config
     // TODO: Legacy code, should be replaced with code from OPNsense framework
-    write_config("${import_log_message} Lets Encrypt SSL certificate: ${cert_cn}");
+    write_config("${import_log_message} Let's Encrypt SSL certificate: ${cert_cn}");
 
     // Update (acme) certificate object (through MVC framework)
     $uuid = $certObj->attributes()->uuid;
diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/+TARGETS b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/+TARGETS
index 91b1e9bdd..d00a85339 100644
--- a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/+TARGETS
+++ b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/+TARGETS
@@ -1,3 +1,2 @@
 lighttpd-acme-challenge.conf:/var/etc/lighttpd-acme-challenge.conf
 rc.conf.d:/etc/rc.conf.d/acme_http_challenge
-lighttpd-rc-script:/usr/local/etc/rc.d/acme_http_challenge
diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
index 5215bcbae..fe1e2557b 100644
--- a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
+++ b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
@@ -2,6 +2,8 @@
 # Automatically generated configuration.
 # Do not edit this file manually.
 
+{% if helpers.exists('OPNsense.AcmeClient.settings') %}
+
 # FreeBSD!
 server.event-handler = "freebsd-kqueue"
 server.network-backend = "writev"
@@ -84,3 +86,5 @@ compress.filetype  = ("text/plain","text/css", "text/xml", "text/javascript" )
 server.max-request-size = 4096
 
 expire.url = ( "" => "access 10 hours" )
+
+{% endif %}