diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.c b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
index eb9e7feab9fdec2e27684a8a46a705c6faf63bb6..dbefce5793d59db8d3420e651cddd4443a8035bc 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c
@@ -653,7 +653,7 @@ static int db_ldap_set_tls_options(struct ldap_connection *conn)
 {
 	const struct sieve_ldap_settings *set = conn->lstorage->ldap_set;
 
-	if (!set->tls)
+	if (!set->starttls)
 		return 0;
 
 #ifdef OPENLDAP_TLS_OPTIONS
@@ -717,9 +717,9 @@ static int db_ldap_set_options(struct ldap_connection *conn)
 				"db: sasl_bind=yes requires ldap_version=3");
 			return -1;
 		}
-		if (set->tls) {
+		if (set->starttls) {
 			e_error(storage->event,
-				"db: tls=yes requires ldap_version=3");
+				"db: ldap_starttls=yes requires ldap_version=3");
 			return -1;
 		}
 	}
@@ -763,7 +763,7 @@ int sieve_ldap_db_connect(struct ldap_connection *conn)
 			return -1;
 	}
 
-	if (set->tls) {
+	if (set->starttls) {
 #ifdef LDAP_HAVE_START_TLS_S
 		ret = ldap_start_tls_s(conn->ld, NULL, NULL);
 		if (ret != LDAP_SUCCESS) {
@@ -771,7 +771,7 @@ int sieve_ldap_db_connect(struct ldap_connection *conn)
 			    *set->uris != '\0' &&
 			    str_begins_with(set->uris, "ldaps:")) {
 				e_error(storage->event, "db: "
-					"Don't use both tls=yes and ldaps URI");
+					"Don't use both ldap_starttls=yes and ldaps URI");
 			}
 			e_error(storage->event, "db: "
 				"ldap_start_tls_s() failed: %s",
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
index eb787f226506b1fba6b227274df65d442a9ccc7c..f2561f70dab7b58b61539675f7ce8d1f93515752 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c
@@ -28,7 +28,7 @@ static const struct setting_define sieve_ldap_setting_defines[] = {
 	DEF(STR, uris),
 	DEF(STR, auth_dn),
 	DEF(STR, auth_dn_password),
-	DEF(BOOL, tls),
+	DEF(BOOL, starttls),
 	DEF(BOOL, sasl_bind),
 	DEF(STR, sasl_mech),
 	DEF(STR, sasl_realm),
@@ -53,7 +53,7 @@ const struct sieve_ldap_settings sieve_ldap_default_settings = {
 	.uris = "",
 	.auth_dn = "",
 	.auth_dn_password = "",
-	.tls = FALSE,
+	.starttls = FALSE,
 	.sasl_bind = FALSE,
 	.sasl_mech = "",
 	.sasl_realm = "",
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
index 3220dbff4c1889bfa93c938adb60f443e49c9e5b..de41f579c239fbbd255e973720569c5a3b355712 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h
@@ -8,7 +8,7 @@ struct sieve_ldap_settings {
 	const char *auth_dn;
 	const char *auth_dn_password;
 
-	bool tls;
+	bool starttls;
 	bool sasl_bind;
 	const char *sasl_mech;
 	const char *sasl_realm;