diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index 8bcac6e48..c9e9d8276 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -32,6 +32,8 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 			capaOpenPGP: SettingsCapa('OpenPGP')
 		});
 
+		this.gnuPGversion = 'GnuPG v' + SettingsGet('gnupg');
+
 		const reset = () => {
 			this.saveError(false);
 			this.saveSuccess(false);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 6d3fac5aa..54a550d35 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -456,6 +456,9 @@ class ActionsAdmin extends Actions
 			$aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true);
 			$aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true);
 			$aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true);
+
+			$gnupg = \SnappyMail\PGP\GnuPG::getInstance('');
+			$aResult['gnupg'] = $gnupg ? $gnupg->getEngineInfo()['version'] : null;
 		} else {
 			$passfile = APP_PRIVATE_DATA.'admin_password.txt';
 			$sPassword = $oConfig->Get('security', 'admin_password', '');
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
index e29fcd06c..d96bf34bf 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsSecurity.html
@@ -17,7 +17,7 @@
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'GnuPG',
+					label: gnuPGversion,
 					value: capaGnuPG
 				}
 			}"></div>