diff --git a/migration/i2.1z/oracle/201502081982-IDEMPIERE-2470.sql b/migration/i2.1z/oracle/201502081982-IDEMPIERE-2470.sql
new file mode 100644
index 0000000000..66f33962c0
--- /dev/null
+++ b/migration/i2.1z/oracle/201502081982-IDEMPIERE-2470.sql
@@ -0,0 +1,9 @@
+SET SQLBLANKLINES ON
+SET DEFINE OFF
+
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+-- Aug 2, 2015 3:17:29 AM WITA
+UPDATE AD_SysConfig SET ConfigurationLevel='C',Updated=TO_DATE('2015-08-02 03:17:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50018
+;
+SELECT register_migration_script('201502081982-IDEMPIERE-2470.sql') FROM dual
+;
diff --git a/migration/i2.1z/postgresql/201502081982-IDEMPIERE-2470.sql b/migration/i2.1z/postgresql/201502081982-IDEMPIERE-2470.sql
new file mode 100644
index 0000000000..199c194917
--- /dev/null
+++ b/migration/i2.1z/postgresql/201502081982-IDEMPIERE-2470.sql
@@ -0,0 +1,6 @@
+-- I forgot to set the DICTIONARY_ID_COMMENTS System Configurator
+-- Aug 2, 2015 3:17:29 AM WITA
+UPDATE AD_SysConfig SET ConfigurationLevel='C',Updated=TO_TIMESTAMP('2015-08-02 03:17:29','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_SysConfig_ID=50018
+;
+SELECT register_migration_script('201502081982-IDEMPIERE-2470.sql') FROM dual
+;
diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
index 679634d61b..75337d0441 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java
@@ -196,7 +196,7 @@ public abstract class InfoPanel extends Window implements EventListener<Event>,
 				log.log(Level.SEVERE, "Cannot parse context= " + whereClause);
 		}
 		
-		pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, DEFAULT_PAGE_SIZE);
+		pageSize = MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, DEFAULT_PAGE_SIZE, Env.getAD_Client_ID(Env.getCtx()));
 		
 		init();