diff --git a/VERSION b/VERSION
index acbef7695..bf29619fd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.22.2
+2.22.3
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
index 154234155..b0ee29490 100644
--- a/package/yast2-users.changes
+++ b/package/yast2-users.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 22 11:18:07 CET 2012 - jsuchome@suse.cz
+
+- User specific LDAP configuration moved here from ldap-client,
+  shown as "LDAP Administration Settings" dialog (fate#313143)
+- fixed Password Policy handling 
+- 2.22.3
+
 -------------------------------------------------------------------
 Tue Jan 31 15:50:13 CET 2012 - jsuchome@suse.cz
 
diff --git a/src/ldap_dialogs.ycp b/src/ldap_dialogs.ycp
index 06a4d9c47..5018f6e14 100644
--- a/src/ldap_dialogs.ycp
+++ b/src/ldap_dialogs.ycp
@@ -30,6 +30,7 @@
 
 import "Label";
 import "Ldap";
+import "LdapPopup";
 import "Popup";
 import "Users";
 import "Wizard";
@@ -472,6 +473,8 @@ define boolean LdapAdministrationDialog () {
 	}
     }
 
+    read_ppolicies ();
+
     string help_text    = // help text caption
     _("<p><b>Home Directories</b></p>") +
 
@@ -519,8 +522,6 @@ have changed your configuration.</p>
       `VSpacing(0.4)
     );
 
-    read_ppolicies ();
-
     Wizard::CreateDialog ();
     // dialog title
     Wizard::SetContentsButtons (_("LDAP Administration Settings"), contents,