diff -Nur e-smith-base-5.2.0-optimize_user_modify_unix/createlinks e-smith-base-5.2.0-user_modify_in_bootstrap/createlinks
--- e-smith-base-5.2.0-optimize_user_modify_unix/createlinks	2013-01-30 21:29:34.031216617 +0100
+++ e-smith-base-5.2.0-user_modify_in_bootstrap/createlinks	2013-01-31 19:14:54.980807821 +0100
@@ -334,6 +334,7 @@
 templates2events("/etc/nsswitch.conf", $event);
 templates2events("/etc/pam.d/system-auth", $event);
 event_link("user-lock-passwd", $event, "15");
+event_link("user-modify-unix", $event, "15");
 
 #--------------------------------------------------
 # actions for group-create event
@@ -416,7 +417,6 @@
 event_link("conf-startup", $event, "10");
 event_link("user-lock-passwd", $event, "15");
 event_link("group-modify-unix", $event, "15");
-event_link("user-modify-unix", $event, "15");
 event_link("update-passwd", $event, "20");
 event_link("count-active-user-accounts", $event, "25");
 event_link("conf-modules", $event, "30");
diff -Nur e-smith-base-5.2.0-optimize_user_modify_unix/root/etc/e-smith/events/actions/user-modify-unix e-smith-base-5.2.0-user_modify_in_bootstrap/root/etc/e-smith/events/actions/user-modify-unix
--- e-smith-base-5.2.0-optimize_user_modify_unix/root/etc/e-smith/events/actions/user-modify-unix	2013-01-30 21:31:10.221693946 +0100
+++ e-smith-base-5.2.0-user_modify_in_bootstrap/root/etc/e-smith/events/actions/user-modify-unix	2013-01-31 19:15:51.560227676 +0100
@@ -57,7 +57,7 @@
 my $a = esmith::AccountsDB->open or die "Could not open accounts db";
 
 my @users;
-if ($event eq 'post-upgrade')
+if ($event eq 'bootstrap-ldap-save')
 {
     @users = $a->users;
 }