diff --git a/src/lib-sieve/storage/dict/sieve-dict-storage.c b/src/lib-sieve/storage/dict/sieve-dict-storage.c
index 4c7468764d04166ffc492a10acf9818af6856726..cd8a72d78a7e20032ff1ca00acd5846be7a43481 100644
--- a/src/lib-sieve/storage/dict/sieve-dict-storage.c
+++ b/src/lib-sieve/storage/dict/sieve-dict-storage.c
@@ -54,15 +54,8 @@ sieve_dict_storage_init(struct sieve_storage *storage,
 		}
 	}
 
-	if (username == NULL) {
-		if (svinst->username == NULL) {
-			sieve_storage_set_critical(storage,
-						   "No username specified");
-			*error_code_r = SIEVE_ERROR_TEMP_FAILURE;
-			return -1;
-		}
+	if (username == NULL)
 		username = svinst->username;
-	}
 
 	if (svinst->base_dir == NULL) {
 		sieve_storage_set_critical(
diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
index b413c7c7ce5927c2ff2643e5aeecf898db63c1ed..ec08831d824873205d54aef62288421fa00ae616 100644
--- a/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
+++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage.c
@@ -67,15 +67,8 @@ sieve_ldap_storage_init(struct sieve_storage *storage,
 		}
 	}
 
-	if (username == NULL) {
-		if (svinst->username == NULL) {
-			sieve_storage_set_critical(
-				storage, "No username specified");
-			*error_code_r = SIEVE_ERROR_TEMP_FAILURE;
-			return -1;
-		}
+	if (username == NULL)
 		username = svinst->username;
-	}
 
 	e_debug(storage->event, "user=%s, config=%s",
 		username, storage->location);
diff --git a/src/plugins/sieve-extprograms/sieve-extprograms-common.c b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
index fae2ecb31ad4b60717800c6961381af056b1b377..ea954c72ce5221bffeda3534c43696815b181282 100644
--- a/src/plugins/sieve-extprograms/sieve-extprograms-common.c
+++ b/src/plugins/sieve-extprograms/sieve-extprograms-common.c
@@ -539,10 +539,8 @@ sieve_extprogram_create(const struct sieve_extension *ext,
 			svinst->event, path, args, &pc_params);
 	}
 
-	if (svinst->username != NULL) {
-		program_client_set_env(sprog->program_client, "USER",
-				       svinst->username);
-	}
+	program_client_set_env(sprog->program_client, "USER",
+			       svinst->username);
 	if (svinst->home_dir != NULL) {
 		program_client_set_env(sprog->program_client, "HOME",
 				       svinst->home_dir);