diff --git a/remaster/mcs/dovecot-ldap.conf b/remaster/mcs/dovecot-ldap.conf
index ad63734..9857af7 100644
--- a/remaster/mcs/dovecot-ldap.conf
+++ b/remaster/mcs/dovecot-ldap.conf
@@ -87,7 +87,8 @@ scope = subtree
 # http://wiki.dovecot.org/UserDatabase/ExtraFields
 # user_attrs = mailMessageStore=mail=maildir:/maildirs/%$,maildirquota=quota_rule=*:backend,mail_plugins,maildirwarn3=quota_warning=storage=%$%% /usr/local/bin/quota-warning.sh %$
 #,maildirwarn2=quota_warning2=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u,maildirwarn3=quota_warning3=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u
-user_attrs = mailMessageStore=mail=maildir:/maildirs/%$,maildirquota=quota_rule=*:backend,mail_plugins,maildirwarn1=quota_warning=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u,maildirwarn2=quota_warning2=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u,maildirwarn3=quota_warning3=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u
+#user_attrs = mailMessageStore=mail=maildir:/maildirs/%$,maildirquota=quota_rule=*:backend,mail_plugins,maildirwarn1=quota_warning=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u,maildirwarn2=quota_warning2=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u,maildirwarn3=quota_warning3=storage=%$%% /usr/local/bin/quota-warning.sh %$ %u
+user_attrs = mailMessageStore=mail=maildir:/maildirs/%$,maildirquota=quota_rule=*:backend
 
 pass_attrs = mail=user,userPassword=password,mailMessageStore=userdb_home
 #pass_attrs = mail=user,userPassword=password,mailMessageStore=userdb_home
diff --git a/remaster/mcs/dovecot.conf b/remaster/mcs/dovecot.conf
index 74be733..4fd50d2 100644
--- a/remaster/mcs/dovecot.conf
+++ b/remaster/mcs/dovecot.conf
@@ -12,7 +12,7 @@ mail_log_prefix = "%Us(%u)(%r)(%p): "
 mail_uid = 8
 managesieve_notify_capability = mailto
 managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment 
-mailbox date
+#mailbox date
 namespace {
   inbox = yes
   location = 
diff --git a/remaster/mcs/mailware-sabayon-conf/web/WEB-INF/balance.xml b/remaster/mcs/mailware-sabayon-conf/web/WEB-INF/balance.xml
index 2cbc442..c071153 100644
--- a/remaster/mcs/mailware-sabayon-conf/web/WEB-INF/balance.xml
+++ b/remaster/mcs/mailware-sabayon-conf/web/WEB-INF/balance.xml
@@ -10,7 +10,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
  <bean id="balanceService" class="it.babel.manager.services.AddressBookBalanceService">
 	<property name="balanceGroups">
 		<map>
-			<entry key="isola1">
+			<entry key="node1">
 				<bean class="it.babel.manager.model.BalanceGroup">
 					<property name="balanceItems" >
  		
@@ -30,7 +30,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
 			</entry>
 			<!-- ALTRA ENTRY PER ALTRA ISOLA -->
 			<!-- 
-			<entry key="isola2">
+			<entry key="node2">
 				<bean class="it.babel.manager.model.BalanceGroup">
 					<property name="balanceItems" >
  		
diff --git a/remaster/mcs/scripts/mcs-ldapinit.pl b/remaster/mcs/scripts/mcs-ldapinit.pl
index ea85ad7..8ad25f0 100644
--- a/remaster/mcs/scripts/mcs-ldapinit.pl
+++ b/remaster/mcs/scripts/mcs-ldapinit.pl
@@ -125,6 +125,7 @@ sub create_ldif() {
   printf(FH "objectClass: organizationalPerson\n");
   printf(FH "objectClass: inetorgperson\n");
   printf(FH "objectClass: babmwcompany\n");
+  printf(FH "objectClass: mailrecipient\n");
   printf(FH "sn: Administrator\n");
   printf(FH "cn: Service Administrator\n");
   printf(FH "userPassword: $password\n");
@@ -196,6 +197,8 @@ sub create_ldif() {
   printf(FH "o: example\n");
   printf(FH "companyQuota: 102400\n");
   printf(FH "companyvatnumber: 1234567890\n");
+  printf(FH "mailHost: localhost\n");
+  printf(FH "mailUserAgentHost: 127.0.0.1\n");
   printf(FH "objectClass: top\n");
   printf(FH "objectClass: organization\n");
   printf(FH "objectClass: babmwcompany\n");