diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
index 7be848351d699223445685b5c0dafcdb6a007c3c..ce8b10e6d75443eacacf56aa214f3b1368336f96 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_reindexAll.xml
@@ -58,28 +58,15 @@ if clear_catalog:\n
   catalog = portal.portal_catalog.getSQLCatalog(sql_catalog_id)\n
   catalog.manage_catalogClear()\n
 \n
-print "#### Indexing preferences ####"\n
-tag = \'portal_preferences\'\n
-context.portal_preferences.activate(\n
-                    tag=tag,\n
-                    priority=additional_priority).Folder_reindexAll(\n
-                                         folder_tag=tag,\n
-                                         object_tag=tag,\n
-                                         object_priority=additional_priority,\n
-                                         sql_catalog_id=sql_catalog_id,\n
-                                         start_tree=start_tree,\n
-                                         stop_tree=stop_tree,)\n
-\n
 # Reindex person module\n
 print "#### Indexing person_module, stage 1 ####"\n
 person_module=getattr(portal, \'person_module\', None)\n
 higher_priority = 1 + additional_priority\n
 if person_module is not None :\n
   tag = \'person_stage_1\'\n
-  folder_after_tag = (\'portal_preferences\',)\n
   person_module.activate(tag=tag,\n
                          priority=higher_priority,\n
-                         after_tag=folder_after_tag).Folder_reindexAll(\n
+  ).Folder_reindexAll(\n
                                          folder_tag=tag,\n
                                          object_tag=tag,\n
                                          object_priority=higher_priority,\n
@@ -132,11 +119,24 @@ for folder in [context.portal_alarms, context.portal_activities]:\n
                                            start_tree=start_tree,\n
                                            stop_tree=stop_tree,)\n
 \n
+print "#### Indexing preferences ####"\n
+preference_tag = \'portal_preferences\'\n
+context.portal_preferences.activate(\n
+                    tag=preference_tag,\n
+                    after_tag=\'category\',\n
+                    priority=additional_priority).Folder_reindexAll(\n
+                                         folder_tag=preference_tag,\n
+                                         object_tag=preference_tag,\n
+                                         object_priority=additional_priority,\n
+                                         sql_catalog_id=sql_catalog_id,\n
+                                         start_tree=start_tree,\n
+                                         stop_tree=stop_tree,)\n
+\n
 # We index simulation first to make sure we can calculate tests\n
 # (ie. related quantity)\n
 print "#### Indexing simulation ####"\n
 folder_tag = \'module\'\n
-folder_after_tag = (\'category\', \'document\', \'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'document\', \'person_stage_1\', \'group_person_stage_1\', preference_tag)\n
 object_tag = \'simulation\'\n
 object_after_tag = folder_after_tag\n
 object_priority = 3 + additional_priority\n
@@ -171,7 +171,7 @@ print "#### Indexing portal types ####"\n
 print "#### Indexing portal property sheets ####"\n
 \n
 folder_tag = \'module\'\n
-folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\')\n
+folder_after_tag = (\'category\', \'person_stage_1\', \'group_person_stage_1\', preference_tag)\n
 object_tag = \'document\'\n
 object_after_tag = folder_after_tag\n
 object_priority = 2 + additional_priority\n
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 8c82f23ce4dbadc7c7448f7ac71da9df70f7ecbb..f4b568062b671764f616e61a884f962d5106bfc5 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-41055
\ No newline at end of file
+41056
\ No newline at end of file