diff --git a/install/froxlor.sql b/install/froxlor.sql
index 02184c02..c1144f10 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -888,11 +888,11 @@ CREATE TABLE IF NOT EXISTS `cronjobs_run` (
 
 
 INSERT INTO `cronjobs_run` (`id`, `module`, `cronfile`, `cronclass`, `interval`, `isactive`, `desc_lng_key`) VALUES
-	(1, 'froxlor/core', 'tasks', '\\Froxlor\\Cron\\TasksCron', '5 MINUTE', '1', 'cron_tasks'),
+	(1, 'froxlor/core', 'tasks', '\\Froxlor\\Cron\\System\\TasksCron', '5 MINUTE', '1', 'cron_tasks'),
 	(2, 'froxlor/core', 'traffic', '\\Froxlor\\Cron\\Traffic\\TrafficCron', '1 DAY', '1', 'cron_traffic'),
 	(3, 'froxlor/reports', 'usage_report', '\\Froxlor\\Cron\\Traffic\\ReportsCron', '1 DAY', '1', 'cron_usage_report'),
 	(4, 'froxlor/core', 'mailboxsize', '\\Froxlor\\Cron\\System\\MailboxsizeCron', '6 HOUR', '1', 'cron_mailboxsize'),
-	(5, 'froxlor/letsencrypt', 'letsencrypt', '\\Froxlor\\Cron\\LetsEncrypt\\LetsEncrypt', '5 MINUTE', '0', 'cron_letsencrypt'),
+	(5, 'froxlor/letsencrypt', 'letsencrypt', '\\Froxlor\\Cron\\Http\\LetsEncrypt\\LetsEncrypt', '5 MINUTE', '0', 'cron_letsencrypt'),
 	(6, 'froxlor/backup', 'backup', '\\Froxlor\\Cron\\System\\BackupCron', '1 DAY', '1', 'cron_backup');
 
 
diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php
index 830f5781..919dcd05 100644
--- a/install/updates/froxlor/0.10/update_0.10.inc.php
+++ b/install/updates/froxlor/0.10/update_0.10.inc.php
@@ -134,7 +134,7 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201812180')) {
 	Database::query("ALTER TABLE `" . TABLE_PANEL_CRONRUNS . "` ADD `cronclass` varchar(500) NOT NULL AFTER `cronfile`");
 	$upd_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `cronclass`  = :cc WHERE `cronfile` = :cf");
 	Database::pexecute($upd_stmt, array(
-		'cc' => '\\Froxlor\\Cron\\TasksCron',
+		'cc' => '\\Froxlor\\Cron\\System\\TasksCron',
 		'cf' => 'tasks'
 	));
 	Database::pexecute($upd_stmt, array(
@@ -150,7 +150,7 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201812180')) {
 		'cf' => 'mailboxsize'
 	));
 	Database::pexecute($upd_stmt, array(
-		'cc' => '\\Froxlor\\Cron\\LetsEncrypt\\LetsEncrypt',
+		'cc' => '\\Froxlor\\Cron\\Http\\LetsEncrypt\\LetsEncrypt',
 		'cf' => 'letsencrypt'
 	));
 	Database::pexecute($upd_stmt, array(
diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt.php b/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt.php
new file mode 100644
index 00000000..8d628e2b
--- /dev/null
+++ b/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt.php
@@ -0,0 +1,303 @@
+<?php
+namespace Froxlor\Cron\Http\LetsEncrypt;
+
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\Settings;
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Florian Aders <kontakt-froxlor@neteraser.de>
+ * @author Froxlor team <team@froxlor.org> (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *         
+ * @since 0.9.35
+ *       
+ */
+class LetsEncrypt extends \Froxlor\Cron\FroxlorCron
+{
+
+	public static function run()
+	{
+		if (Settings::Get('system.leapiversion') == '2') {
+			// use ACME v2 is specified
+			\Froxlor\Cron\Http\LetsEncrypt\LetsEncrypt_v2::run();
+			exit();
+		}
+
+		FroxlorLogger::getInstanceOf()->logAction(CRON_ACTION, LOG_INFO, "Updating Let's Encrypt certificates");
+
+		if (! extension_loaded('curl')) {
+			FroxlorLogger::getInstanceOf()->logAction(CRON_ACTION, LOG_ERR, "Let's Encrypt requires the php cURL extension to be installed.");
+			exit();
+		}
+
+		$certificates_stmt = Database::query("
+		SELECT
+			domssl.`id`,
+			domssl.`domainid`,
+			domssl.expirationdate,
+			domssl.`ssl_cert_file`,
+			domssl.`ssl_key_file`,
+			domssl.`ssl_ca_file`,
+			domssl.`ssl_csr_file`,
+			dom.`domain`,
+			dom.`wwwserveralias`,
+			dom.`documentroot`,
+			dom.`id` AS 'domainid',
+			dom.`ssl_redirect`,
+			cust.`leprivatekey`,
+			cust.`lepublickey`,
+			cust.`leregistered`,
+			cust.`customerid`,
+			cust.`loginname`
+		FROM
+			`" . TABLE_PANEL_CUSTOMERS . "` AS cust,
+			`" . TABLE_PANEL_DOMAINS . "` AS dom
+		LEFT JOIN
+			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` AS domssl ON
+				dom.`id` = domssl.`domainid`
+		WHERE
+			dom.`customerid` = cust.`customerid`
+			AND cust.deactivated = 0
+			AND dom.`letsencrypt` = 1
+			AND dom.`aliasdomain` IS NULL
+			AND dom.`iswildcarddomain` = 0
+			AND (
+				domssl.`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY)
+				OR domssl.`expirationdate` IS NULL
+			)
+	");
+
+		$aliasdomains_stmt = Database::prepare("
+		SELECT
+			dom.`id` as domainid,
+			dom.`domain`,
+			dom.`wwwserveralias`
+		FROM `" . TABLE_PANEL_DOMAINS . "` AS dom
+		WHERE
+			dom.`aliasdomain` = :id
+			AND dom.`letsencrypt` = 1
+			AND dom.`iswildcarddomain` = 0
+	");
+
+		$updcert_stmt = Database::prepare("
+		REPLACE INTO
+			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
+		SET
+			`id` = :id,
+			`domainid` = :domainid,
+			`ssl_cert_file` = :crt,
+			`ssl_key_file` = :key,
+			`ssl_ca_file` = :ca,
+			`ssl_cert_chainfile` = :chain,
+			`ssl_csr_file` = :csr,
+			`ssl_fullchain_file` = :fullchain,
+			`expirationdate` = :expirationdate
+	");
+
+		$upddom_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `ssl_redirect` = '1' WHERE `id` = :domainid");
+
+		// flag for re-generation of vhost files
+		$changedetected = 0;
+
+		// first - generate LE for system-vhost if enabled
+		if (Settings::Get('system.le_froxlor_enabled') == '1') {
+
+			$certrow = array(
+				'loginname' => 'froxlor.panel',
+				'domain' => Settings::Get('system.hostname'),
+				'domainid' => 0,
+				'documentroot' => \Froxlor\Froxlor::getInstallDir(),
+				'leprivatekey' => Settings::Get('system.leprivatekey'),
+				'lepublickey' => Settings::Get('system.lepublickey'),
+				'leregistered' => Settings::Get('system.leregistered'),
+				'ssl_redirect' => Settings::Get('system.le_froxlor_redirect'),
+				'expirationdate' => null,
+				'ssl_cert_file' => null,
+				'ssl_key_file' => null,
+				'ssl_ca_file' => null,
+				'ssl_csr_file' => null,
+				'id' => null
+			);
+
+			$froxlor_ssl_settings_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
+		WHERE `domainid` = '0' AND
+		(`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY) OR `expirationdate` IS NULL)
+	");
+			$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
+
+			$insert_or_update_required = true;
+			if ($froxlor_ssl) {
+				$certrow['id'] = $froxlor_ssl['id'];
+				$certrow['expirationdate'] = $froxlor_ssl['expirationdate'];
+				$certrow['ssl_cert_file'] = $froxlor_ssl['ssl_cert_file'];
+				$certrow['ssl_key_file'] = $froxlor_ssl['ssl_key_file'];
+				$certrow['ssl_ca_file'] = $froxlor_ssl['ssl_ca_file'];
+				$certrow['ssl_csr_file'] = $froxlor_ssl['ssl_csr_file'];
+			} else {
+				// check whether we have an entry with valid certificates which just does not need
+				// updating yet, so we need to skip this here
+				$froxlor_ssl_settings_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = '0'
+		");
+				$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
+				if ($froxlor_ssl && ! empty($froxlor_ssl['ssl_cert_file'])) {
+					$insert_or_update_required = false;
+				}
+			}
+
+			if ($insert_or_update_required) {
+				$domains = array(
+					$certrow['domain']
+				);
+
+				// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
+				// - this temp. deactivation of the ssl-redirect is handled by the webserver-cronjob
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
+
+				$cronlog = FroxlorLogger::getInstanceOf(array(
+					'loginname' => $certrow['loginname']
+				));
+
+				try {
+					// Initialize Lescript with documentroot
+					$le = new \Froxlor\Http\LetsEncrypt\LeScript($cronlog, \Froxlor\Froxlor::getVersion());
+
+					// Initialize Lescript
+					$le->initAccount($certrow, true);
+
+					// Request the new certificate (old key may be used)
+					$return = $le->signDomains($domains, $certrow['ssl_key_file']);
+
+					// We are interessted in the expirationdate
+					$newcert = openssl_x509_parse($return['crt']);
+
+					// Store the new data
+					Database::pexecute($updcert_stmt, array(
+						'id' => $certrow['id'],
+						'domainid' => $certrow['domainid'],
+						'crt' => $return['crt'],
+						'key' => $return['key'],
+						'ca' => $return['chain'],
+						'chain' => $return['chain'],
+						'csr' => $return['csr'],
+						'fullchain' => $return['fullchain'],
+						'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
+					));
+
+					if ($certrow['ssl_redirect'] == 3) {
+						Settings::Set('system.le_froxlor_redirect', '1');
+					}
+
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
+
+					$changedetected = 1;
+				} catch (\Exception $e) {
+					$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
+				}
+			}
+		}
+
+		// customer domains
+		$certrows = $certificates_stmt->fetchAll(\PDO::FETCH_ASSOC);
+		foreach ($certrows as $certrow) {
+
+			// set logger to corresponding loginname for the log to appear in the users system-log
+			$cronlog = FroxlorLogger::getInstanceOf(array(
+				'loginname' => $certrow['loginname']
+			));
+
+			// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
+			if ($certrow['ssl_redirect'] != 2) {
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
+
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $certrow['domain']);
+				$domains = array(
+					$certrow['domain']
+				);
+				// add www.<domain> to SAN list
+				if ($certrow['wwwserveralias'] == 1) {
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $certrow['domain']);
+					$domains[] = 'www.' . $certrow['domain'];
+				}
+
+				// add alias domains (and possibly www.<aliasdomain>) to SAN list
+				Database::pexecute($aliasdomains_stmt, array(
+					'id' => $certrow['domainid']
+				));
+				$aliasdomains = $aliasdomains_stmt->fetchAll(\PDO::FETCH_ASSOC);
+				foreach ($aliasdomains as $aliasdomain) {
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $aliasdomain['domain']);
+					$domains[] = $aliasdomain['domain'];
+					if ($aliasdomain['wwwserveralias'] == 1) {
+						$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $aliasdomain['domain']);
+						$domains[] = 'www.' . $aliasdomain['domain'];
+					}
+				}
+
+				try {
+					// Initialize Lescript with documentroot
+					$le = new \Froxlor\Http\LetsEncrypt\LeScript($cronlog, \Froxlor\Froxlor::getVersion());
+
+					// Initialize Lescript
+					$le->initAccount($certrow);
+
+					// Request the new certificate (old key may be used)
+					$return = $le->signDomains($domains, $certrow['ssl_key_file']);
+
+					// We are interessted in the expirationdate
+					$newcert = openssl_x509_parse($return['crt']);
+
+					// Store the new data
+					Database::pexecute($updcert_stmt, array(
+						'id' => $certrow['id'],
+						'domainid' => $certrow['domainid'],
+						'crt' => $return['crt'],
+						'key' => $return['key'],
+						'ca' => $return['chain'],
+						'chain' => $return['chain'],
+						'csr' => $return['csr'],
+						'fullchain' => $return['fullchain'],
+						'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
+					));
+
+					if ($certrow['ssl_redirect'] == 3) {
+						Database::pexecute($upddom_stmt, array(
+							'domainid' => $certrow['domainid']
+						));
+					}
+
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
+
+					$changedetected = 1;
+				} catch (\Exception $e) {
+					$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
+				}
+			} else {
+				$cronlog->logAction(CRON_ACTION, LOG_WARNING, "Skipping Let's Encrypt generation for " . $certrow['domain'] . " due to an enabled ssl_redirect");
+			}
+		}
+
+		// If we have a change in a certificate, we need to update the webserver - configs
+		// This is easiest done by just creating a new task ;)
+		if ($changedetected) {
+			inserttask(1);
+		}
+
+		// reset logger
+		$cronlog = FroxlorLogger::getInstanceOf(array(
+			'loginname' => 'cronjob'
+		));
+		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Let's Encrypt certificates have been updated");
+	}
+}
diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt_v2.php b/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt_v2.php
new file mode 100644
index 00000000..a62b658c
--- /dev/null
+++ b/lib/Froxlor/Cron/Http/LetsEncrypt/LetsEncrypt_v2.php
@@ -0,0 +1,307 @@
+<?php
+namespace Froxlor\Cron\Http\LetsEncrypt;
+
+use Froxlor\Database\Database;
+use Froxlor\FroxlorLogger;
+use Froxlor\Settings;
+
+/**
+ * This file is part of the Froxlor project.
+ * Copyright (c) 2016 the Froxlor Team (see authors).
+ *
+ * For the full copyright and license information, please view the COPYING
+ * file that was distributed with this source code. You can also view the
+ * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
+ *
+ * @copyright (c) the authors
+ * @author Florian Aders <kontakt-froxlor@neteraser.de>
+ * @author Froxlor team <team@froxlor.org> (2016-)
+ * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
+ * @package Cron
+ *         
+ * @since 0.9.35
+ *       
+ */
+class LetsEncrypt_v2 extends \Froxlor\Cron\FroxlorCron
+{
+
+	public static function run()
+	{
+		FroxlorLogger::getInstanceOf()->logAction(CRON_ACTION, LOG_INFO, "Updating Let's Encrypt certificates");
+
+		if (! extension_loaded('curl')) {
+			FroxlorLogger::getInstanceOf()->logAction(CRON_ACTION, LOG_ERR, "Let's Encrypt requires the php cURL extension to be installed.");
+			exit();
+		}
+
+		$certificates_stmt = Database::query("
+		SELECT
+			domssl.`id`,
+			domssl.`domainid`,
+			domssl.expirationdate,
+			domssl.`ssl_cert_file`,
+			domssl.`ssl_key_file`,
+			domssl.`ssl_ca_file`,
+			domssl.`ssl_csr_file`,
+			dom.`domain`,
+			dom.`wwwserveralias`,
+			dom.`iswildcarddomain`,
+			dom.`documentroot`,
+			dom.`id` AS 'domainid',
+			dom.`ssl_redirect`,
+			cust.`leprivatekey`,
+			cust.`lepublickey`,
+			cust.`leregistered`,
+			cust.`leaccount`,
+			cust.`customerid`,
+			cust.`loginname`
+		FROM
+			`" . TABLE_PANEL_CUSTOMERS . "` AS cust,
+			`" . TABLE_PANEL_DOMAINS . "` AS dom
+		LEFT JOIN
+			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` AS domssl ON
+				dom.`id` = domssl.`domainid`
+		WHERE
+			dom.`customerid` = cust.`customerid`
+			AND cust.deactivated = 0
+			AND dom.`letsencrypt` = 1
+			AND dom.`aliasdomain` IS NULL
+			AND dom.`iswildcarddomain` = 0
+			AND (
+				domssl.`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY)
+				OR domssl.`expirationdate` IS NULL
+			)
+	");
+
+		$aliasdomains_stmt = Database::prepare("
+		SELECT
+			dom.`id` as domainid,
+			dom.`domain`,
+			dom.`wwwserveralias`,
+			dom.`iswildcarddomain`
+		FROM `" . TABLE_PANEL_DOMAINS . "` AS dom
+		WHERE
+			dom.`aliasdomain` = :id
+			AND dom.`letsencrypt` = 1
+			AND dom.`iswildcarddomain` = 0
+	");
+
+		$updcert_stmt = Database::prepare("
+		REPLACE INTO
+			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
+		SET
+			`id` = :id,
+			`domainid` = :domainid,
+			`ssl_cert_file` = :crt,
+			`ssl_key_file` = :key,
+			`ssl_ca_file` = :ca,
+			`ssl_cert_chainfile` = :chain,
+			`ssl_csr_file` = :csr,
+			`ssl_fullchain_file` = :fullchain,
+			`expirationdate` = :expirationdate
+	");
+
+		$upddom_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `ssl_redirect` = '1' WHERE `id` = :domainid");
+
+		// flag for re-generation of vhost files
+		$changedetected = 0;
+
+		// first - generate LE for system-vhost if enabled
+		if (Settings::Get('system.le_froxlor_enabled') == '1') {
+
+			$certrow = array(
+				'loginname' => 'froxlor.panel',
+				'domain' => Settings::Get('system.hostname'),
+				'domainid' => 0,
+				'documentroot' => \Froxlor\Froxlor::getInstallDir(),
+				'leprivatekey' => Settings::Get('system.leprivatekey'),
+				'lepublickey' => Settings::Get('system.lepublickey'),
+				'leregistered' => Settings::Get('system.leregistered'),
+				'leaccount' => Settings::Get('system.leaccount'),
+				'ssl_redirect' => Settings::Get('system.le_froxlor_redirect'),
+				'expirationdate' => null,
+				'ssl_cert_file' => null,
+				'ssl_key_file' => null,
+				'ssl_ca_file' => null,
+				'ssl_csr_file' => null,
+				'id' => null
+			);
+
+			$froxlor_ssl_settings_stmt = Database::prepare("
+		SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
+		WHERE `domainid` = '0' AND
+		(`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY) OR `expirationdate` IS NULL)
+	");
+			$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
+
+			$insert_or_update_required = true;
+			if ($froxlor_ssl) {
+				$certrow['id'] = $froxlor_ssl['id'];
+				$certrow['expirationdate'] = $froxlor_ssl['expirationdate'];
+				$certrow['ssl_cert_file'] = $froxlor_ssl['ssl_cert_file'];
+				$certrow['ssl_key_file'] = $froxlor_ssl['ssl_key_file'];
+				$certrow['ssl_ca_file'] = $froxlor_ssl['ssl_ca_file'];
+				$certrow['ssl_csr_file'] = $froxlor_ssl['ssl_csr_file'];
+			} else {
+				// check whether we have an entry with valid certificates which just does not need
+				// updating yet, so we need to skip this here
+				$froxlor_ssl_settings_stmt = Database::prepare("
+			SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = '0'
+		");
+				$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
+				if ($froxlor_ssl && ! empty($froxlor_ssl['ssl_cert_file'])) {
+					$insert_or_update_required = false;
+				}
+			}
+
+			if ($insert_or_update_required) {
+				$domains = array(
+					$certrow['domain']
+				);
+
+				// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
+				// - this temp. deactivation of the ssl-redirect is handled by the webserver-cronjob
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
+
+				$cronlog = FroxlorLogger::getInstanceOf(array(
+					'loginname' => $certrow['loginname']
+				));
+
+				try {
+					// Initialize Lescript with documentroot
+					$le = new \Froxlor\Http\LetsEncrypt\LeScript_v2($cronlog, \Froxlor\Froxlor::getVersion());
+
+					// Initialize Lescript
+					$le->initAccount($certrow, true);
+
+					// Request the new certificate (old key may be used)
+					$return = $le->signDomains($domains, $certrow['ssl_key_file']);
+
+					// We are interessted in the expirationdate
+					$newcert = openssl_x509_parse($return['crt']);
+
+					// Store the new data
+					Database::pexecute($updcert_stmt, array(
+						'id' => $certrow['id'],
+						'domainid' => $certrow['domainid'],
+						'crt' => $return['crt'],
+						'key' => $return['key'],
+						'ca' => $return['chain'],
+						'chain' => $return['chain'],
+						'csr' => $return['csr'],
+						'fullchain' => $return['fullchain'],
+						'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
+					));
+
+					if ($certrow['ssl_redirect'] == 3) {
+						Settings::Set('system.le_froxlor_redirect', '1');
+					}
+
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
+
+					$changedetected = 1;
+				} catch (\Exception $e) {
+					$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
+				}
+			}
+		}
+
+		// customer domains
+		$certrows = $certificates_stmt->fetchAll(\PDO::FETCH_ASSOC);
+		foreach ($certrows as $certrow) {
+
+			// set logger to corresponding loginname for the log to appear in the users system-log
+			$cronlog = FroxlorLogger::getInstanceOf(array(
+				'loginname' => $certrow['loginname']
+			));
+
+			// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
+			if ($certrow['ssl_redirect'] != 2) {
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
+
+				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $certrow['domain']);
+				$domains = array(
+					$certrow['domain']
+				);
+				if ($certrow['iswildcarddomain'] == 1) {
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: *." . $certrow['domain']);
+					$domains[] = '*.' . $certrow['domain'];
+				} elseif ($certrow['wwwserveralias'] == 1) {
+					// add www.<domain> to SAN list
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $certrow['domain']);
+					$domains[] = 'www.' . $certrow['domain'];
+				}
+
+				// add alias domains (and possibly www.<aliasdomain>) to SAN list
+				Database::pexecute($aliasdomains_stmt, array(
+					'id' => $certrow['domainid']
+				));
+				$aliasdomains = $aliasdomains_stmt->fetchAll(\PDO::FETCH_ASSOC);
+				foreach ($aliasdomains as $aliasdomain) {
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $aliasdomain['domain']);
+					$domains[] = $aliasdomain['domain'];
+					if ($aliasdomain['iswildcarddomain'] == 1) {
+						$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: *." . $aliasdomain['domain']);
+						$domains[] = '*.' . $aliasdomain['domain'];
+					} elseif ($aliasdomain['wwwserveralias'] == 1) {
+						$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $aliasdomain['domain']);
+						$domains[] = 'www.' . $aliasdomain['domain'];
+					}
+				}
+
+				try {
+					// Initialize Lescript with documentroot
+					$le = new \Froxlor\Http\LetsEncrypt\LeScript_v2($cronlog, \Froxlor\Froxlor::getVersion());
+
+					// Initialize Lescript
+					$le->initAccount($certrow);
+
+					// Request the new certificate (old key may be used)
+					$return = $le->signDomains($domains, $certrow['ssl_key_file']);
+
+					// We are interessted in the expirationdate
+					$newcert = openssl_x509_parse($return['crt']);
+
+					// Store the new data
+					Database::pexecute($updcert_stmt, array(
+						'id' => $certrow['id'],
+						'domainid' => $certrow['domainid'],
+						'crt' => $return['crt'],
+						'key' => $return['key'],
+						'ca' => $return['chain'],
+						'chain' => $return['chain'],
+						'csr' => $return['csr'],
+						'fullchain' => $return['fullchain'],
+						'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
+					));
+
+					if ($certrow['ssl_redirect'] == 3) {
+						Database::pexecute($upddom_stmt, array(
+							'domainid' => $certrow['domainid']
+						));
+					}
+
+					$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
+
+					$changedetected = 1;
+				} catch (\Exception $e) {
+					$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
+				}
+			} else {
+				$cronlog->logAction(CRON_ACTION, LOG_WARNING, "Skipping Let's Encrypt generation for " . $certrow['domain'] . " due to an enabled ssl_redirect");
+			}
+		}
+
+		// If we have a change in a certificate, we need to update the webserver - configs
+		// This is easiest done by just creating a new task ;)
+		if ($changedetected) {
+			inserttask(1);
+		}
+
+		// reset logger
+		$cronlog = FroxlorLogger::getInstanceOf(array(
+			'loginname' => 'cronjob'
+		));
+		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Let's Encrypt certificates have been updated");
+	}
+}
diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt.php b/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt.php
deleted file mode 100644
index 992ec65a..00000000
--- a/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-if (! defined('MASTER_CRONJOB'))
-	die('You cannot access this file directly!');
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2016 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Florian Aders <kontakt-froxlor@neteraser.de>
- * @author Froxlor team <team@froxlor.org> (2016-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- * @since 0.9.35
- *
- */
-
-if (Settings::Get('system.leapiversion') == '2') {
-	// use ACME v2 is specified
-	require_once __DIR__ . '/cron_letsencrypt_v2.php';
-	exit;
-}
-
-$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating Let's Encrypt certificates");
-
-if (! extension_loaded('curl')) {
-	$cronlog->logAction(CRON_ACTION, LOG_ERR, "Let's Encrypt requires the php cURL extension to be installed.");
-	exit();
-}
-
-$certificates_stmt = Database::query("
-		SELECT
-			domssl.`id`,
-			domssl.`domainid`,
-			domssl.expirationdate,
-			domssl.`ssl_cert_file`,
-			domssl.`ssl_key_file`,
-			domssl.`ssl_ca_file`,
-			domssl.`ssl_csr_file`,
-			dom.`domain`,
-			dom.`wwwserveralias`,
-			dom.`documentroot`,
-			dom.`id` AS 'domainid',
-			dom.`ssl_redirect`,
-			cust.`leprivatekey`,
-			cust.`lepublickey`,
-			cust.`leregistered`,
-			cust.`customerid`,
-			cust.`loginname`
-		FROM
-			`" . TABLE_PANEL_CUSTOMERS . "` AS cust,
-			`" . TABLE_PANEL_DOMAINS . "` AS dom
-		LEFT JOIN
-			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` AS domssl ON
-				dom.`id` = domssl.`domainid`
-		WHERE
-			dom.`customerid` = cust.`customerid`
-			AND cust.deactivated = 0
-			AND dom.`letsencrypt` = 1
-			AND dom.`aliasdomain` IS NULL
-			AND dom.`iswildcarddomain` = 0
-			AND (
-				domssl.`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY)
-				OR domssl.`expirationdate` IS NULL
-			)
-	");
-
-$aliasdomains_stmt = Database::prepare("
-		SELECT
-			dom.`id` as domainid,
-			dom.`domain`,
-			dom.`wwwserveralias`
-		FROM `" . TABLE_PANEL_DOMAINS . "` AS dom
-		WHERE
-			dom.`aliasdomain` = :id
-			AND dom.`letsencrypt` = 1
-			AND dom.`iswildcarddomain` = 0
-	");
-
-$updcert_stmt = Database::prepare("
-		REPLACE INTO
-			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
-		SET
-			`id` = :id,
-			`domainid` = :domainid,
-			`ssl_cert_file` = :crt,
-			`ssl_key_file` = :key,
-			`ssl_ca_file` = :ca,
-			`ssl_cert_chainfile` = :chain,
-			`ssl_csr_file` = :csr,
-			`ssl_fullchain_file` = :fullchain,
-			`expirationdate` = :expirationdate
-	");
-
-$upddom_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `ssl_redirect` = '1' WHERE `id` = :domainid");
-
-// flag for re-generation of vhost files
-$changedetected = 0;
-
-// first - generate LE for system-vhost if enabled
-if (Settings::Get('system.le_froxlor_enabled') == '1') {
-
-	$certrow = array(
-		'loginname' => 'froxlor.panel',
-		'domain' => Settings::Get('system.hostname'),
-		'domainid' => 0,
-		'documentroot' => \Froxlor\Froxlor::getInstallDir(),
-		'leprivatekey' => Settings::Get('system.leprivatekey'),
-		'lepublickey' => Settings::Get('system.lepublickey'),
-		'leregistered' => Settings::Get('system.leregistered'),
-		'ssl_redirect' => Settings::Get('system.le_froxlor_redirect'),
-		'expirationdate' => null,
-		'ssl_cert_file' => null,
-		'ssl_key_file' => null,
-		'ssl_ca_file' => null,
-		'ssl_csr_file' => null,
-		'id' => null
-	);
-
-	$froxlor_ssl_settings_stmt = Database::prepare("
-		SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
-		WHERE `domainid` = '0' AND
-		(`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY) OR `expirationdate` IS NULL)
-	");
-	$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
-
-	$insert_or_update_required = true;
-	if ($froxlor_ssl) {
-		$certrow['id'] = $froxlor_ssl['id'];
-		$certrow['expirationdate'] = $froxlor_ssl['expirationdate'];
-		$certrow['ssl_cert_file'] = $froxlor_ssl['ssl_cert_file'];
-		$certrow['ssl_key_file'] = $froxlor_ssl['ssl_key_file'];
-		$certrow['ssl_ca_file'] = $froxlor_ssl['ssl_ca_file'];
-		$certrow['ssl_csr_file'] = $froxlor_ssl['ssl_csr_file'];
-	} else {
-		// check whether we have an entry with valid certificates which just does not need
-		// updating yet, so we need to skip this here
-		$froxlor_ssl_settings_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = '0'
-		");
-		$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
-		if ($froxlor_ssl && ! empty($froxlor_ssl['ssl_cert_file'])) {
-			$insert_or_update_required = false;
-		}
-	}
-
-	if ($insert_or_update_required) {
-		$domains = array(
-			$certrow['domain']
-		);
-
-		// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
-		// - this temp. deactivation of the ssl-redirect is handled by the webserver-cronjob
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
-
-		$cronlog = FroxlorLogger::getInstanceOf(array(
-			'loginname' => $certrow['loginname']
-		));
-
-		try {
-			// Initialize Lescript with documentroot
-			$le = new lescript($cronlog, $version);
-
-			// Initialize Lescript
-			$le->initAccount($certrow, true);
-
-			// Request the new certificate (old key may be used)
-			$return = $le->signDomains($domains, $certrow['ssl_key_file']);
-
-			// We are interessted in the expirationdate
-			$newcert = openssl_x509_parse($return['crt']);
-
-			// Store the new data
-			Database::pexecute($updcert_stmt, array(
-				'id' => $certrow['id'],
-				'domainid' => $certrow['domainid'],
-				'crt' => $return['crt'],
-				'key' => $return['key'],
-				'ca' => $return['chain'],
-				'chain' => $return['chain'],
-				'csr' => $return['csr'],
-				'fullchain' => $return['fullchain'],
-				'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
-			));
-
-			if ($certrow['ssl_redirect'] == 3) {
-				Settings::Set('system.le_froxlor_redirect', '1');
-			}
-
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
-
-			$changedetected = 1;
-		} catch (Exception $e) {
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
-		}
-	}
-}
-
-// customer domains
-$certrows = $certificates_stmt->fetchAll(PDO::FETCH_ASSOC);
-foreach ($certrows as $certrow) {
-
-	// set logger to corresponding loginname for the log to appear in the users system-log
-	$cronlog = FroxlorLogger::getInstanceOf(array(
-		'loginname' => $certrow['loginname']
-	));
-
-	// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
-	if ($certrow['ssl_redirect'] != 2) {
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
-
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $certrow['domain']);
-		$domains = array(
-			$certrow['domain']
-		);
-		// add www.<domain> to SAN list
-		if ($certrow['wwwserveralias'] == 1) {
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $certrow['domain']);
-			$domains[] = 'www.' . $certrow['domain'];
-		}
-
-		// add alias domains (and possibly www.<aliasdomain>) to SAN list
-		Database::pexecute($aliasdomains_stmt, array(
-			'id' => $certrow['domainid']
-		));
-		$aliasdomains = $aliasdomains_stmt->fetchAll(PDO::FETCH_ASSOC);
-		foreach ($aliasdomains as $aliasdomain) {
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $aliasdomain['domain']);
-			$domains[] = $aliasdomain['domain'];
-			if ($aliasdomain['wwwserveralias'] == 1) {
-				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $aliasdomain['domain']);
-				$domains[] = 'www.' . $aliasdomain['domain'];
-			}
-		}
-
-		try {
-			// Initialize Lescript with documentroot
-			$le = new lescript($cronlog, $version);
-
-			// Initialize Lescript
-			$le->initAccount($certrow);
-
-			// Request the new certificate (old key may be used)
-			$return = $le->signDomains($domains, $certrow['ssl_key_file']);
-
-			// We are interessted in the expirationdate
-			$newcert = openssl_x509_parse($return['crt']);
-
-			// Store the new data
-			Database::pexecute($updcert_stmt, array(
-				'id' => $certrow['id'],
-				'domainid' => $certrow['domainid'],
-				'crt' => $return['crt'],
-				'key' => $return['key'],
-				'ca' => $return['chain'],
-				'chain' => $return['chain'],
-				'csr' => $return['csr'],
-				'fullchain' => $return['fullchain'],
-				'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
-			));
-
-			if ($certrow['ssl_redirect'] == 3) {
-				Database::pexecute($upddom_stmt, array(
-					'domainid' => $certrow['domainid']
-				));
-			}
-
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
-
-			$changedetected = 1;
-		} catch (Exception $e) {
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
-		}
-	} else {
-		$cronlog->logAction(CRON_ACTION, LOG_WARNING, "Skipping Let's Encrypt generation for " . $certrow['domain'] . " due to an enabled ssl_redirect");
-	}
-}
-
-// If we have a change in a certificate, we need to update the webserver - configs
-// This is easiest done by just creating a new task ;)
-if ($changedetected) {
-	inserttask(1);
-}
-
-// reset logger
-$cronlog = FroxlorLogger::getInstanceOf(array(
-	'loginname' => 'cronjob'
-));
-$cronlog->logAction(CRON_ACTION, LOG_INFO, "Let's Encrypt certificates have been updated");
diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt_v2.php b/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt_v2.php
deleted file mode 100644
index 858a0870..00000000
--- a/lib/Froxlor/Cron/Http/LetsEncrypt/cron_letsencrypt_v2.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-if (! defined('MASTER_CRONJOB'))
-	die('You cannot access this file directly!');
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2016 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright (c) the authors
- * @author Florian Aders <kontakt-froxlor@neteraser.de>
- * @author Froxlor team <team@froxlor.org> (2016-)
- * @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package Cron
- *
- * @since 0.9.35
- *
- */
-
-$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating Let's Encrypt certificates");
-
-if (! extension_loaded('curl')) {
-	$cronlog->logAction(CRON_ACTION, LOG_ERR, "Let's Encrypt requires the php cURL extension to be installed.");
-	exit();
-}
-
-$certificates_stmt = Database::query("
-		SELECT
-			domssl.`id`,
-			domssl.`domainid`,
-			domssl.expirationdate,
-			domssl.`ssl_cert_file`,
-			domssl.`ssl_key_file`,
-			domssl.`ssl_ca_file`,
-			domssl.`ssl_csr_file`,
-			dom.`domain`,
-			dom.`wwwserveralias`,
-			dom.`iswildcarddomain`,
-			dom.`documentroot`,
-			dom.`id` AS 'domainid',
-			dom.`ssl_redirect`,
-			cust.`leprivatekey`,
-			cust.`lepublickey`,
-			cust.`leregistered`,
-			cust.`leaccount`,
-			cust.`customerid`,
-			cust.`loginname`
-		FROM
-			`" . TABLE_PANEL_CUSTOMERS . "` AS cust,
-			`" . TABLE_PANEL_DOMAINS . "` AS dom
-		LEFT JOIN
-			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` AS domssl ON
-				dom.`id` = domssl.`domainid`
-		WHERE
-			dom.`customerid` = cust.`customerid`
-			AND cust.deactivated = 0
-			AND dom.`letsencrypt` = 1
-			AND dom.`aliasdomain` IS NULL
-			AND dom.`iswildcarddomain` = 0
-			AND (
-				domssl.`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY)
-				OR domssl.`expirationdate` IS NULL
-			)
-	");
-
-$aliasdomains_stmt = Database::prepare("
-		SELECT
-			dom.`id` as domainid,
-			dom.`domain`,
-			dom.`wwwserveralias`,
-			dom.`iswildcarddomain`
-		FROM `" . TABLE_PANEL_DOMAINS . "` AS dom
-		WHERE
-			dom.`aliasdomain` = :id
-			AND dom.`letsencrypt` = 1
-			AND dom.`iswildcarddomain` = 0
-	");
-
-$updcert_stmt = Database::prepare("
-		REPLACE INTO
-			`" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
-		SET
-			`id` = :id,
-			`domainid` = :domainid,
-			`ssl_cert_file` = :crt,
-			`ssl_key_file` = :key,
-			`ssl_ca_file` = :ca,
-			`ssl_cert_chainfile` = :chain,
-			`ssl_csr_file` = :csr,
-			`ssl_fullchain_file` = :fullchain,
-			`expirationdate` = :expirationdate
-	");
-
-$upddom_stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `ssl_redirect` = '1' WHERE `id` = :domainid");
-
-// flag for re-generation of vhost files
-$changedetected = 0;
-
-// first - generate LE for system-vhost if enabled
-if (Settings::Get('system.le_froxlor_enabled') == '1') {
-
-	$certrow = array(
-		'loginname' => 'froxlor.panel',
-		'domain' => Settings::Get('system.hostname'),
-		'domainid' => 0,
-		'documentroot' => \Froxlor\Froxlor::getInstallDir(),
-		'leprivatekey' => Settings::Get('system.leprivatekey'),
-		'lepublickey' => Settings::Get('system.lepublickey'),
-		'leregistered' => Settings::Get('system.leregistered'),
-		'leaccount' => Settings::Get('system.leaccount'),
-		'ssl_redirect' => Settings::Get('system.le_froxlor_redirect'),
-		'expirationdate' => null,
-		'ssl_cert_file' => null,
-		'ssl_key_file' => null,
-		'ssl_ca_file' => null,
-		'ssl_csr_file' => null,
-		'id' => null
-	);
-
-	$froxlor_ssl_settings_stmt = Database::prepare("
-		SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "`
-		WHERE `domainid` = '0' AND
-		(`expirationdate` < DATE_ADD(NOW(), INTERVAL 30 DAY) OR `expirationdate` IS NULL)
-	");
-	$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
-
-	$insert_or_update_required = true;
-	if ($froxlor_ssl) {
-		$certrow['id'] = $froxlor_ssl['id'];
-		$certrow['expirationdate'] = $froxlor_ssl['expirationdate'];
-		$certrow['ssl_cert_file'] = $froxlor_ssl['ssl_cert_file'];
-		$certrow['ssl_key_file'] = $froxlor_ssl['ssl_key_file'];
-		$certrow['ssl_ca_file'] = $froxlor_ssl['ssl_ca_file'];
-		$certrow['ssl_csr_file'] = $froxlor_ssl['ssl_csr_file'];
-	} else {
-		// check whether we have an entry with valid certificates which just does not need
-		// updating yet, so we need to skip this here
-		$froxlor_ssl_settings_stmt = Database::prepare("
-			SELECT * FROM `" . TABLE_PANEL_DOMAIN_SSL_SETTINGS . "` WHERE `domainid` = '0'
-		");
-		$froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt);
-		if ($froxlor_ssl && ! empty($froxlor_ssl['ssl_cert_file'])) {
-			$insert_or_update_required = false;
-		}
-	}
-
-	if ($insert_or_update_required) {
-		$domains = array(
-			$certrow['domain']
-		);
-
-		// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
-		// - this temp. deactivation of the ssl-redirect is handled by the webserver-cronjob
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
-
-		$cronlog = FroxlorLogger::getInstanceOf(array(
-			'loginname' => $certrow['loginname']
-		));
-
-		try {
-			// Initialize Lescript with documentroot
-			$le = new lescript_v2($cronlog, $version);
-
-			// Initialize Lescript
-			$le->initAccount($certrow, true);
-
-			// Request the new certificate (old key may be used)
-			$return = $le->signDomains($domains, $certrow['ssl_key_file']);
-
-			// We are interessted in the expirationdate
-			$newcert = openssl_x509_parse($return['crt']);
-
-			// Store the new data
-			Database::pexecute($updcert_stmt, array(
-				'id' => $certrow['id'],
-				'domainid' => $certrow['domainid'],
-				'crt' => $return['crt'],
-				'key' => $return['key'],
-				'ca' => $return['chain'],
-				'chain' => $return['chain'],
-				'csr' => $return['csr'],
-				'fullchain' => $return['fullchain'],
-				'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
-			));
-
-			if ($certrow['ssl_redirect'] == 3) {
-				Settings::Set('system.le_froxlor_redirect', '1');
-			}
-
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
-
-			$changedetected = 1;
-		} catch (Exception $e) {
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
-		}
-	}
-}
-
-// customer domains
-$certrows = $certificates_stmt->fetchAll(PDO::FETCH_ASSOC);
-foreach ($certrows as $certrow) {
-
-	// set logger to corresponding loginname for the log to appear in the users system-log
-	$cronlog = FroxlorLogger::getInstanceOf(array(
-		'loginname' => $certrow['loginname']
-	));
-
-	// Only renew let's encrypt certificate if no broken ssl_redirect is enabled
-	if ($certrow['ssl_redirect'] != 2) {
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updating " . $certrow['domain']);
-
-		$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $certrow['domain']);
-		$domains = array(
-			$certrow['domain']
-		);
-		if ($certrow['iswildcarddomain'] == 1) {
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: *." . $certrow['domain']);
-			$domains[] = '*.' . $certrow['domain'];
-		}
-		elseif ($certrow['wwwserveralias'] == 1) {
-			// add www.<domain> to SAN list
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $certrow['domain']);
-			$domains[] = 'www.' . $certrow['domain'];
-		}
-
-		// add alias domains (and possibly www.<aliasdomain>) to SAN list
-		Database::pexecute($aliasdomains_stmt, array(
-			'id' => $certrow['domainid']
-		));
-		$aliasdomains = $aliasdomains_stmt->fetchAll(PDO::FETCH_ASSOC);
-		foreach ($aliasdomains as $aliasdomain) {
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: " . $aliasdomain['domain']);
-			$domains[] = $aliasdomain['domain'];
-			if ($aliasdomain['iswildcarddomain'] == 1) {
-				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: *." . $aliasdomain['domain']);
-				$domains[] = '*.' . $aliasdomain['domain'];
-			}
-			elseif ($aliasdomain['wwwserveralias'] == 1) {
-				$cronlog->logAction(CRON_ACTION, LOG_INFO, "Adding SAN entry: www." . $aliasdomain['domain']);
-				$domains[] = 'www.' . $aliasdomain['domain'];
-			}
-		}
-
-		try {
-			// Initialize Lescript with documentroot
-			$le = new lescript_v2($cronlog, $version);
-
-			// Initialize Lescript
-			$le->initAccount($certrow);
-
-			// Request the new certificate (old key may be used)
-			$return = $le->signDomains($domains, $certrow['ssl_key_file']);
-
-			// We are interessted in the expirationdate
-			$newcert = openssl_x509_parse($return['crt']);
-
-			// Store the new data
-			Database::pexecute($updcert_stmt, array(
-				'id' => $certrow['id'],
-				'domainid' => $certrow['domainid'],
-				'crt' => $return['crt'],
-				'key' => $return['key'],
-				'ca' => $return['chain'],
-				'chain' => $return['chain'],
-				'csr' => $return['csr'],
-				'fullchain' => $return['fullchain'],
-				'expirationdate' => date('Y-m-d H:i:s', $newcert['validTo_time_t'])
-			));
-
-			if ($certrow['ssl_redirect'] == 3) {
-				Database::pexecute($upddom_stmt, array(
-					'domainid' => $certrow['domainid']
-				));
-			}
-
-			$cronlog->logAction(CRON_ACTION, LOG_INFO, "Updated Let's Encrypt certificate for " . $certrow['domain']);
-
-			$changedetected = 1;
-		} catch (Exception $e) {
-			$cronlog->logAction(CRON_ACTION, LOG_ERR, "Could not get Let's Encrypt certificate for " . $certrow['domain'] . ": " . $e->getMessage());
-		}
-	} else {
-		$cronlog->logAction(CRON_ACTION, LOG_WARNING, "Skipping Let's Encrypt generation for " . $certrow['domain'] . " due to an enabled ssl_redirect");
-	}
-}
-
-// If we have a change in a certificate, we need to update the webserver - configs
-// This is easiest done by just creating a new task ;)
-if ($changedetected) {
-	inserttask(1);
-}
-
-// reset logger
-$cronlog = FroxlorLogger::getInstanceOf(array(
-	'loginname' => 'cronjob'
-));
-$cronlog->logAction(CRON_ACTION, LOG_INFO, "Let's Encrypt certificates have been updated");