diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
index 52a63ca9..609613ff 100644
--- a/install/froxlor.sql.php
+++ b/install/froxlor.sql.php
@@ -645,8 +645,6 @@ opcache.validate_timestamps'),
 	('system', 'leprivatekey', 'unset'),
 	('system', 'lepublickey', 'unset'),
 	('system', 'letsencryptca', 'letsencrypt'),
-	('system', 'letsencryptcountrycode', 'DE'),
-	('system', 'letsencryptstate', 'Hessen'),
 	('system', 'letsencryptchallengepath', '/var/www/froxlor'),
 	('system', 'letsencryptkeysize', '4096'),
 	('system', 'letsencryptreuseold', 0),
diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php
index 75c53216..fef40021 100644
--- a/install/updates/froxlor/update_2.x.inc.php
+++ b/install/updates/froxlor/update_2.x.inc.php
@@ -158,6 +158,8 @@ if (Froxlor::isFroxlorVersion('0.10.99')) {
 	];
 	Settings::Set('panel.standardlanguage', $lang_map[Settings::Get('panel_standardlanguage')] ?? 'en');
 	Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'debug_cron'");
+	Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'letsencryptcountrycode'");
+	Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'letsencryptstate'");
 	Update::lastStepStatus(0);
 
 	Froxlor::updateToVersion($update_to);
diff --git a/lng/de.lng.php b/lng/de.lng.php
index dba89ddb..08fc9903 100644
--- a/lng/de.lng.php
+++ b/lng/de.lng.php
@@ -789,7 +789,7 @@ return [
 		'youcantdeleteyourself' => 'Aus Sicherheitsgründen können Sie sich nicht selbst löschen.',
 		'youcanteditallfieldsofyourself' => 'Hinweis: Aus Sicherheitsgründen können Sie nicht alle Felder Ihres eigenen Accounts bearbeiten.',
 		'documentrootexists' => 'Es existiert noch ein Verzeichnis "%s" für diesen Kunden. Bitte löschen Sie dieses vorher.',
-		'formtokencompromised' => 'Das Formular scheint manipuliert worden zu sein. Aus Sicherheitsgründen wurden Sie ausgelogged.',
+		'norepymailiswrong' => 'Die "Noreply-Adresse" ist ungültig. Nur eine valide E-Mail Adresse kann akzeptiert werden.',
 		'logerror' => 'Log-Fehler: "%s"',
 		'nomessagetosend' => 'Keine Nachricht angegeben',
 		'norecipientsgiven' => 'Keine Empfänger angegeben',
@@ -1100,6 +1100,11 @@ Vielen Dank, Ihr Administrator',
 		'mysql_server' => 'MySQL-Server',
 		'database_edit' => 'Datenbank bearbeiten',
 		'size' => 'Datenbankgröße',
+		'privileged_user' => 'Privilegierter Datenbankbenutzer',
+		'privileged_passwd' => 'Passwort für privilegierten Benutzer',
+		'unprivileged_passwd' => 'Passwort für nicht privilegierten Benutzer',
+		'mysql_ssl_ca_file' => 'SSL-Serverzertifikat',
+		'mysql_ssl_verify_server_certificate' => 'Verifizieren des SSL-Serverzertifikats'
 	],
 	'panel' => [
 		'edit' => 'bearbeiten',
@@ -1855,14 +1860,6 @@ Vielen Dank, Ihr Administrator',
 			'title' => 'ACME Umgebung',
 			'description' => 'Umgebung, welche genutzt wird um Zertifikate zu bestellen.',
 		],
-		'letsencryptcountrycode' => [
-			'title' => 'Let\'s Encrypt Ländercode',
-			'description' => '2 - stelliger Ländercode, welcher benutzt wird um Let\'s Encrypt - Zertifikate zu bestellen.',
-		],
-		'letsencryptstate' => [
-			'title' => 'Let\'s Encrypt Bundesland',
-			'description' => 'Bundesland, welches benutzt wird, um Let\'s Encrypt - Zertifikate zu bestellen.',
-		],
 		'letsencryptchallengepath' => [
 			'title' => 'Verzeichnis für Let\'s Encrypt challenges',
 			'description' => 'Let\'s Encrypt challenges werden aus diesem Verzeichnis über einen globalen Alias ausgeliefert.',
diff --git a/lng/en.lng.php b/lng/en.lng.php
index 425f8298..605d1d34 100644
--- a/lng/en.lng.php
+++ b/lng/en.lng.php
@@ -541,256 +541,6 @@ return [
 		'also_change_ftp' => ' also change password of the main FTP account',
 		'also_change_stats' => ' also change password for the statistics page',
 	],
-	'country' => [
-		'AF' => 'Afghanistan',
-		'AX' => 'Aland Islands',
-		'AL' => 'Albania',
-		'DZ' => 'Algeria',
-		'AS' => 'American Samoa',
-		'AD' => 'Andorra',
-		'AO' => 'Angola',
-		'AI' => 'Anguilla',
-		'AQ' => 'Antarctica',
-		'AG' => 'Antigua and Barbuda',
-		'AR' => 'Argentina',
-		'AM' => 'Armenia',
-		'AW' => 'Aruba',
-		'AU' => 'Australia',
-		'AT' => 'Austria',
-		'AZ' => 'Azerbaijan',
-		'BS' => 'Bahamas',
-		'BH' => 'Bahrain',
-		'BD' => 'Bangladesh',
-		'BB' => 'Barbados',
-		'BY' => 'Belarus',
-		'BE' => 'Belgium',
-		'BZ' => 'Belize',
-		'BJ' => 'Benin',
-		'BM' => 'Bermuda',
-		'BT' => 'Bhutan',
-		'BO' => 'Bolivia, Plurinational State of',
-		'BQ' => 'Bonaire, Saint Eustatius and Saba',
-		'BA' => 'Bosnia and Herzegovina',
-		'BW' => 'Botswana',
-		'BV' => 'Bouvet Island',
-		'BR' => 'Brazil',
-		'IO' => 'British Indian Ocean Territory',
-		'BN' => 'Brunei Darussalam',
-		'BG' => 'Bulgaria',
-		'BF' => 'Burkina Faso',
-		'BI' => 'Burundi',
-		'KH' => 'Cambodia',
-		'CM' => 'Cameroon',
-		'CA' => 'Canada',
-		'CV' => 'Cape Verde',
-		'KY' => 'Cayman Islands',
-		'CF' => 'Central African Republic',
-		'TD' => 'Chad',
-		'CL' => 'Chile',
-		'CN' => 'China',
-		'CX' => 'Christmas Island',
-		'CC' => 'Cocos (Keeling) Islands',
-		'CO' => 'Colombia',
-		'KM' => 'Comoros',
-		'CG' => 'Congo',
-		'CD' => 'Congo, The Democratic Republic of the',
-		'CK' => 'Cook Islands',
-		'CR' => 'Costa Rica',
-		'CI' => 'Cote D\'ivoire',
-		'HR' => 'Croatia',
-		'CU' => 'Cuba',
-		'CW' => 'Curacao',
-		'CY' => 'Cyprus',
-		'CZ' => 'Czech Republic',
-		'DK' => 'Denmark',
-		'DJ' => 'Djibouti',
-		'DM' => 'Dominica',
-		'DO' => 'Dominican Republic',
-		'EC' => 'Ecuador',
-		'EG' => 'Egypt',
-		'SV' => 'El Salvador',
-		'GQ' => 'Equatorial Guinea',
-		'ER' => 'Eritrea',
-		'EE' => 'Estonia',
-		'ET' => 'Ethiopia',
-		'FK' => 'Falkland Islands (Malvinas)',
-		'FO' => 'Faroe Islands',
-		'FJ' => 'Fiji',
-		'FI' => 'Finland',
-		'FR' => 'France',
-		'GF' => 'French Guiana',
-		'PF' => 'French Polynesia',
-		'TF' => 'French Southern Territories',
-		'GA' => 'Gabon',
-		'GM' => 'Gambia',
-		'GE' => 'Georgia',
-		'DE' => 'Germany',
-		'GH' => 'Ghana',
-		'GI' => 'Gibraltar',
-		'GR' => 'Greece',
-		'GL' => 'Greenland',
-		'GD' => 'Grenada',
-		'GP' => 'Guadeloupe',
-		'GU' => 'Guam',
-		'GT' => 'Guatemala',
-		'GG' => 'Guernsey',
-		'GN' => 'Guinea',
-		'GW' => 'Guinea-Bissau',
-		'GY' => 'Guyana',
-		'HT' => 'Haiti',
-		'HM' => 'Heard Island and McDonald Islands',
-		'VA' => 'Holy See (Vatican City State)',
-		'HN' => 'Honduras',
-		'HK' => 'Hong Kong',
-		'HU' => 'Hungary',
-		'IS' => 'Iceland',
-		'IN' => 'India',
-		'ID' => 'Indonesia',
-		'IR' => 'Iran, Islamic Republic of',
-		'IQ' => 'Iraq',
-		'IE' => 'Ireland',
-		'IM' => 'Isle of Man',
-		'IL' => 'Israel',
-		'IT' => 'Italy',
-		'JM' => 'Jamaica',
-		'JP' => 'Japan',
-		'JE' => 'Jersey',
-		'JO' => 'Jordan',
-		'KZ' => 'Kazakhstan',
-		'KE' => 'Kenya',
-		'KI' => 'Kiribati',
-		'KP' => 'Korea, Democratic People\'s Republic of',
-		'KR' => 'Korea, Republic of',
-		'KW' => 'Kuwait',
-		'KG' => 'Kyrgyzstan',
-		'LA' => 'Lao People\'s Democratic Republic',
-		'LV' => 'Latvia',
-		'LB' => 'Lebanon',
-		'LS' => 'Lesotho',
-		'LR' => 'Liberia',
-		'LY' => 'Libyan Arab Jamahiriya',
-		'LI' => 'Liechtenstein',
-		'LT' => 'Lithuania',
-		'LU' => 'Luxembourg',
-		'MO' => 'Macao',
-		'MK' => 'Macedonia, The Former Yugoslav Republic of',
-		'MG' => 'Madagascar',
-		'MW' => 'Malawi',
-		'MY' => 'Malaysia',
-		'MV' => 'Maldives',
-		'ML' => 'Mali',
-		'MT' => 'Malta',
-		'MH' => 'Marshall Islands',
-		'MQ' => 'Martinique',
-		'MR' => 'Mauritania',
-		'MU' => 'Mauritius',
-		'YT' => 'Mayotte',
-		'MX' => 'Mexico',
-		'FM' => 'Micronesia, Federated States of',
-		'MD' => 'Moldova, Republic of',
-		'MC' => 'Monaco',
-		'MN' => 'Mongolia',
-		'ME' => 'Montenegro',
-		'MS' => 'Montserrat',
-		'MA' => 'Morocco',
-		'MZ' => 'Mozambique',
-		'MM' => 'Myanmar',
-		'NA' => 'Namibia',
-		'NR' => 'Nauru',
-		'NP' => 'Nepal',
-		'NL' => 'Netherlands',
-		'NC' => 'New Caledonia',
-		'NZ' => 'New Zealand',
-		'NI' => 'Nicaragua',
-		'NE' => 'Niger',
-		'NG' => 'Nigeria',
-		'NU' => 'Niue',
-		'NF' => 'Norfolk Island',
-		'MP' => 'Northern Mariana Islands',
-		'NO' => 'Norway',
-		'OM' => 'Oman',
-		'PK' => 'Pakistan',
-		'PW' => 'Palau',
-		'PS' => 'Palestinian Territory, Occupied',
-		'PA' => 'Panama',
-		'PG' => 'Papua New Guinea',
-		'PY' => 'Paraguay',
-		'PE' => 'Peru',
-		'PH' => 'Philippines',
-		'PN' => 'Pitcairn',
-		'PL' => 'Poland',
-		'PT' => 'Portugal',
-		'PR' => 'Puerto Rico',
-		'QA' => 'Qatar',
-		'RE' => 'Reunion',
-		'RO' => 'Romania',
-		'RU' => 'Russian Federation',
-		'RW' => 'Rwanda',
-		'BL' => 'Saint Barthelemy',
-		'SH' => 'Saint Helena, Ascension and Tristan Da Cunha',
-		'KN' => 'Saint Kitts and Nevis',
-		'LC' => 'Saint Lucia',
-		'MF' => 'Saint Martin (French Part)',
-		'PM' => 'Saint Pierre and Miquelon',
-		'VC' => 'Saint Vincent and the Grenadines',
-		'WS' => 'Samoa',
-		'SM' => 'San Marino',
-		'ST' => 'Sao Tome and Principe',
-		'SA' => 'Saudi Arabia',
-		'SN' => 'Senegal',
-		'RS' => 'Serbia',
-		'SC' => 'Seychelles',
-		'SL' => 'Sierra Leone',
-		'SG' => 'Singapore',
-		'SX' => 'Sint Maarten (Dutch Part)',
-		'SK' => 'Slovakia',
-		'SI' => 'Slovenia',
-		'SB' => 'Solomon Islands',
-		'SO' => 'Somalia',
-		'ZA' => 'South Africa',
-		'GS' => 'South Georgia and the South Sandwich Islands',
-		'ES' => 'Spain',
-		'LK' => 'Sri Lanka',
-		'SD' => 'Sudan',
-		'SR' => 'Suriname',
-		'SJ' => 'Svalbard and Jan Mayen',
-		'SZ' => 'Swaziland',
-		'SE' => 'Sweden',
-		'CH' => 'Switzerland',
-		'SY' => 'Syrian Arab Republic',
-		'TW' => 'Taiwan, Province of China',
-		'TJ' => 'Tajikistan',
-		'TZ' => 'Tanzania, United Republic of',
-		'TH' => 'Thailand',
-		'TL' => 'Timor-Leste',
-		'TG' => 'Togo',
-		'TK' => 'Tokelau',
-		'TO' => 'Tonga',
-		'TT' => 'Trinidad and Tobago',
-		'TN' => 'Tunisia',
-		'TR' => 'Turkey',
-		'TM' => 'Turkmenistan',
-		'TC' => 'Turks and Caicos Islands',
-		'TV' => 'Tuvalu',
-		'UG' => 'Uganda',
-		'UA' => 'Ukraine',
-		'AE' => 'United Arab Emirates',
-		'GB' => 'United Kingdom',
-		'US' => 'United States',
-		'UM' => 'United States Minor Outlying Islands',
-		'UY' => 'Uruguay',
-		'UZ' => 'Uzbekistan',
-		'VU' => 'Vanuatu',
-		'VE' => 'Venezuela, Bolivarian Republic of',
-		'VN' => 'Viet Nam',
-		'VG' => 'Virgin Islands, British',
-		'VI' => 'Virgin Islands, U.S.',
-		'WF' => 'Wallis and Futuna',
-		'EH' => 'Western Sahara',
-		'YE' => 'Yemen',
-		'ZM' => 'Zambia',
-		'ZW' => 'Zimbabwe',
-	],
 	'cron' => [
 		'cronname' => 'cronjob-name',
 		'lastrun' => 'last run',
@@ -1104,7 +854,6 @@ return [
 		'youcantdeleteyourself' => 'You cannot delete yourself for security reasons.',
 		'youcanteditallfieldsofyourself' => 'Note: You cannot edit all fields of your own account for security reasons.',
 		'documentrootexists' => 'The directory "%s" already exists for this customer. Please remove this before adding the customer again.',
-		'formtokencompromised' => 'The request seems to be compromised. For security reasons you were logged out.',
 		'norepymailiswrong' => 'The "Noreply-address" is wrong. Only a valid email-address is allowed.',
 		'logerror' => 'Log-Error: %s',
 		'nomessagetosend' => 'You did not enter a message.',
@@ -1420,7 +1169,7 @@ Yours sincerely, your administrator',
 		'size' => 'Size',
 		'privileged_user' => 'Privileged database user',
 		'privileged_passwd' => 'Password for priviliged user',
-		'unprivileged_passwd' => 'Password for unpriviliged user',
+		'unprivileged_passwd' => 'Password for unprivileged user',
 		'mysql_ssl_ca_file' => 'SSL server certificate',
 		'mysql_ssl_verify_server_certificate' => 'Verify SSL server certificate'
 	],
@@ -2228,14 +1977,6 @@ Yours sincerely, your administrator',
 			'title' => 'ACME environment',
 			'description' => 'Environment to be used for Let\'s Encrypt / ZeroSSL certificates.',
 		],
-		'letsencryptcountrycode' => [
-			'title' => 'Let\'s Encrypt country code',
-			'description' => '2 letter country code used to generate Let\'s Encrypt certificates.',
-		],
-		'letsencryptstate' => [
-			'title' => 'Let\'s Encrypt state',
-			'description' => 'State used to generate Let\'s Encrypt certificates.',
-		],
 		'letsencryptchallengepath' => [
 			'title' => 'Path for Let\'s Encrypt challenges',
 			'description' => 'Directory where the Let\'s Encrypt challenges should be offered from via a global alias.',