diff --git a/src/managesieve-login/Makefile.am b/src/managesieve-login/Makefile.am
index 777cfb0fe36d931e3a696cb437e287ae4581c255..84652eace275efdf7d4c4d4801585306b49fa8f9 100644
--- a/src/managesieve-login/Makefile.am
+++ b/src/managesieve-login/Makefile.am
@@ -15,7 +15,9 @@ settings_LTLIBRARIES = \
 	libmanagesieve_login_settings.la
 
 libmanagesieve_login_settings_la_SOURCES = \
+	managesieve-login-settings.c \
 	managesieve-login-settings-plugin.c
+
 libmanagesieve_login_settings_la_CFLAGS = \
 	$(AM_CFLAGS) $(LIBDOVECOT_CONFIG_INCLUDE) -DPKG_LIBEXECDIR=\""$(dovecot_pkglibexecdir)"\"
 
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.c b/src/managesieve-login/managesieve-login-settings-plugin.c
index d0037c846d7ba915a3e08578d0f38ffdce5a98a9..8cff0d78cadf2fd81073dedeffc574ac1027b63b 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.c
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c
@@ -28,7 +28,7 @@ static void managesieve_login_config_parser_begin(struct config_parser_context *
 void managesieve_login_settings_init(struct module *module ATTR_UNUSED)
 {
 	next_hook_config_parser_begin = hook_config_parser_begin;
-	//hook_config_parser_begin = managesieve_login_config_parser_begin;
+	hook_config_parser_begin = managesieve_login_config_parser_begin;
 }
 
 void managesieve_login_settings_deinit(void)
@@ -196,9 +196,11 @@ static void managesieve_login_config_parser_begin(struct config_parser_context *
 		}
 	}
 
+/*	Currently fails and makes doveconf go berserk 
+
 	if ( capability_sieve != NULL )
 		managesieve_login_config_set(ctx, "managesieve_sieve_capability", capability_sieve);
 
 	if ( capability_notify != NULL )
-		managesieve_login_config_set(ctx, "managesieve_notify_capability", capability_notify);
+		managesieve_login_config_set(ctx, "managesieve_notify_capability", capability_notify);*/
 }