diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
index 152d52be27d08..c9d3b9109dd90 100644
--- a/administrator/components/com_config/forms/application.xml
+++ b/administrator/components/com_config/forms/application.xml
@@ -282,7 +282,7 @@
 			label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CA_LABEL"
 			filter="string"
 			size="250"
-			showon="host!:localhost[AND]dbencryption:2"
+			showon="host!:localhost[AND]dbencryption:1,2[AND]dbsslverifyservercert:1"
 		/>
 
 		<field
@@ -291,7 +291,7 @@
 			label="COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CAPATH_LABEL"
 			filter="string"
 			size="250"
-			showon="host!:localhost[AND]dbtype:mysql,mysqli[AND]dbencryption:2"
+			showon="host!:localhost[AND]dbtype:mysql,mysqli[AND]dbencryption:1,2[AND]dbsslverifyservercert:1"
 		/>
 
 		<field
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 01887044cbfc4..271dcd589a84c 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -42,8 +42,8 @@ COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CERT_LABEL="Path to Certificate File"
 COM_CONFIG_FIELD_DATABASE_ENCRYPTION_CIPHER_LABEL="Supported Cipher Suite"
 COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_LABEL="Connection Encryption"
 COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_NONE="Default (server controlled)"
-COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY="One-way encryption"
-COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY="Two-way encryption"
+COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_ONE_WAY="One-way authentication"
+COM_CONFIG_FIELD_DATABASE_ENCRYPTION_ENABLE_VALUE_TWO_WAY="Two-way authentication"
 COM_CONFIG_FIELD_DATABASE_ENCRYPTION_KEY_LABEL="Path to Private Key File"
 COM_CONFIG_FIELD_DATABASE_ENCRYPTION_VERIFY_SERVER_CERT_LABEL="Verify Server Certificate"
 COM_CONFIG_FIELD_DATABASE_HOST_LABEL="Host"