diff --git a/src/managesieve-login/client.c b/src/managesieve-login/client.c
index 34443840bcc380365c773f3f85ac21843261ecb2..515e6a90a0dd7fc66ea7f2973b1df2905a4f2e57 100644
--- a/src/managesieve-login/client.c
+++ b/src/managesieve-login/client.c
@@ -72,6 +72,9 @@ static void client_send_capabilities(struct client *client)
 			msieve_client->set->managesieve_implementation_string, "\"\r\n", NULL));
 		client_send_raw(client, t_strconcat("\"SIEVE\" \"", 
 			msieve_client->set->managesieve_sieve_capability, "\"\r\n", NULL));
+		if ( msieve_client->set->managesieve_notify_capability != NULL )
+			client_send_raw(client, t_strconcat("\"NOTIFY\" \"", 
+				msieve_client->set->managesieve_notify_capability, "\"\r\n", NULL));
 		client_send_raw
 			(client, t_strconcat("\"SASL\" \"", saslcap, "\"\r\n", NULL));
 
diff --git a/src/managesieve-login/managesieve-login-settings.c b/src/managesieve-login/managesieve-login-settings.c
index f00ee8af173ac3ff42b20dcbd0ffd8d7405706b1..a6a0c316f4198955d650e8705a97c092b733cb18 100644
--- a/src/managesieve-login/managesieve-login-settings.c
+++ b/src/managesieve-login/managesieve-login-settings.c
@@ -71,7 +71,7 @@ static const struct setting_define managesieve_login_setting_defines[] = {
 static const struct managesieve_login_settings managesieve_login_default_settings = {
 	.managesieve_implementation_string = PACKAGE_NAME,
 	.managesieve_sieve_capability = "",
-	.managesieve_notify_capability = ""
+	.managesieve_notify_capability = NULL
 };
 
 static const struct setting_parser_info *managesieve_login_setting_dependencies[] = {