diff --git a/src/lib-sieve-tool/mail-raw.c b/src/lib-sieve-tool/mail-raw.c
index d66088d1db055826e36c0ff88695bebdc717b0f7..b38b765b707de17bdf41062a921334edeea516e9 100644
--- a/src/lib-sieve-tool/mail-raw.c
+++ b/src/lib-sieve-tool/mail-raw.c
@@ -166,7 +166,7 @@ void mail_raw_init
 	
 	sets = master_service_settings_get_others(service);
 
-	raw_mail_user = mail_user_alloc(user, sets[0]); 
+	raw_mail_user = mail_user_alloc(user, mail_user->set_info, sets[0]);
 	mail_user_set_home(raw_mail_user, "/");
    
 	if (mail_user_init(raw_mail_user, &errstr) < 0)
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index 3ae6fa081fa58b67747c1db62af98370fcce4ec1..7183c99e28d006a6bf0970ab7acca5a66febe64c 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -256,7 +256,8 @@ int main(int argc, char **argv)
 		if ( mailloc != NULL ) {
 			const char *errstr;
 
-			mail_user = mail_user_alloc(user, mail_user_dovecot->unexpanded_set);
+			mail_user = mail_user_alloc
+				(user, mail_user_dovecot->set_info, mail_user_dovecot->unexpanded_set);
 			mail_user_set_home(mail_user, home);
 
 			if ( mail_user_init(mail_user, &errstr) < 0 )
diff --git a/src/testsuite/testsuite-mailstore.c b/src/testsuite/testsuite-mailstore.c
index 878baa67a2666a85790403c93430498c6c33fe57..a555c0b472a58ba0fe9b5eb44bdeb9ea21ebd294 100644
--- a/src/testsuite/testsuite-mailstore.c
+++ b/src/testsuite/testsuite-mailstore.c
@@ -62,7 +62,8 @@ void testsuite_mailstore_init
 			testsuite_mailstore_tmp);		
 	}
 
-	mail_user = mail_user_alloc(user, service_user->unexpanded_set);
+	mail_user = mail_user_alloc
+		(user, service_user->set_info, service_user->unexpanded_set);
 	mail_user_set_home(mail_user, home);
 
 	if ( mail_user_init(mail_user, &errstr) < 0 )