diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php
index d2e7fba9..6717e1b8 100644
--- a/actions/admin/settings/131.ssl.php
+++ b/actions/admin/settings/131.ssl.php
@@ -149,24 +149,6 @@ return array(
 					),
 					'save_method' => 'storeSettingField'
 				),
-				'system_letsencryptcountrycode' => array(
-					'label' => $lng['serversettings']['letsencryptcountrycode'],
-					'settinggroup' => 'system',
-					'varname' => 'letsencryptcountrycode',
-					'type' => 'string',
-					'string_emptyallowed' => false,
-					'default' => 'DE',
-					'save_method' => 'storeSettingField'
-				),
-				'system_letsencryptstate' => array(
-					'label' => $lng['serversettings']['letsencryptstate'],
-					'settinggroup' => 'system',
-					'varname' => 'letsencryptstate',
-					'type' => 'string',
-					'string_emptyallowed' => false,
-					'default' => 'Hessen',
-					'save_method' => 'storeSettingField'
-				),
 				'system_letsencryptchallengepath' => array(
 					'label' => $lng['serversettings']['letsencryptchallengepath'],
 					'settinggroup' => 'system',
diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
index 900bc076..71daf871 100644
--- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
+++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
@@ -332,7 +332,16 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
 
 	private static function checkUpgrade()
 	{
-		$acmesh_result = \Froxlor\FileDir::safe_exec(self::$acmesh . " --upgrade");
-		FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, "Checking for LetsEncrypt client upgrades before renewing certificates:\n" . implode("\n", $acmesh_result));
+		$lastcheck = \Froxlor\FileDir::makeCorrectFile(dirname(self::$acmesh) . '/.froxlor.lastupdate');
+		if (! file_exists($lastcheck)) {
+			file_put_contents($lastcheck, time());
+		}
+
+		$updatets = file_get_contents($lastcheck);
+		if ((int) trim($updatets) < (time() - 24 * 60 * 60)) {
+			$acmesh_result = \Froxlor\FileDir::safe_exec(self::$acmesh . " --upgrade");
+			FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, "Checking for LetsEncrypt client upgrades before renewing certificates:\n" . implode("\n", $acmesh_result));
+			file_put_contents($lastcheck, time());
+		}
 	}
 }