diff --git a/management/univention-directory-notifier/debian/univention-directory-notifier.postinst b/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
index a3d19c3c1a..2989f0690b 100644
--- a/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
+++ b/management/univention-directory-notifier/debian/univention-directory-notifier.postinst
@@ -36,7 +36,9 @@ univention-config-registry set notifier/autostart?yes
 
 #DEBHELPER#
 
-install -m0700 -o0 -g0 -d /var/lib/univention-ldap/notify
+if [ ! -e /var/lib/univention-ldap/notify ]; then
+	install -m0700 -o0 -g0 -d /var/lib/univention-ldap/notify
+fi
 
 if [ ! -d /var/lib/univention-ldap/schema ]; then
 	mkdir -p /var/lib/univention-ldap/schema
diff --git a/management/univention-directory-notifier/src/network.h b/management/univention-directory-notifier/src/network.h
index 442f1584c3..88fa25c98e 100644
--- a/management/univention-directory-notifier/src/network.h
+++ b/management/univention-directory-notifier/src/network.h
@@ -60,7 +60,7 @@ typedef struct network_client {
 
 }NetworkClient_t;
 
-int network_create_socket();
+int network_create_socket( int port );
 
 int network_client_del ( int fd );
 
diff --git a/management/univention-directory-notifier/src/notify.c b/management/univention-directory-notifier/src/notify.c
index 7c27026e1f..12cd19f724 100644
--- a/management/univention-directory-notifier/src/notify.c
+++ b/management/univention-directory-notifier/src/notify.c
@@ -557,9 +557,9 @@ char* notify_entry_to_string(NotifyEntry_t entry )
 		return NULL;
 	}
 
-		len += 4; /* space + space + newline */
-		len += strlen(entry.dn);
-		len += snprintf(buffer,32, "%ld",entry.notify_id.id);
+	len += 4; /* space + space + newline */
+	len += strlen(entry.dn);
+	len += snprintf(buffer,32, "%ld",entry.notify_id.id);
 
 	len+=1;
 	if ( (str = malloc(len*sizeof(char) ) ) == NULL ) {
@@ -569,8 +569,8 @@ char* notify_entry_to_string(NotifyEntry_t entry )
 	memset(str, 0, len);
 	p=str;
 
-			rc = sprintf(p, "%ld %s %c\n", entry.notify_id.id, entry.dn, entry.command);
-			p+=rc;
+	rc = sprintf(p, "%ld %s %c\n", entry.notify_id.id, entry.dn, entry.command);
+	p+=rc;
 
 	return str;
 
diff --git a/management/univention-directory-notifier/src/univention-directory-notifier.c b/management/univention-directory-notifier/src/univention-directory-notifier.c
index 468dd2b5da..6e587742ef 100644
--- a/management/univention-directory-notifier/src/univention-directory-notifier.c
+++ b/management/univention-directory-notifier/src/univention-directory-notifier.c
@@ -228,10 +228,10 @@ int main(int argc, char* argv[])
 
 	network_client_init( 6669 );
 
-		create_callback_listener ();
+	create_callback_listener ();
 	create_callback_schema ();
 
-		notify_listener_change_callback ( 0, NULL, NULL);
+	notify_listener_change_callback ( 0, NULL, NULL);
 	notify_schema_change_callback ( 0, NULL, NULL);
 
 	network_client_main_loop( );