diff --git a/org.adempiere.ui.swing/src/org/adempiere/client/Client.java b/org.adempiere.ui.swing/src/org/adempiere/client/Client.java
index aeb72a6dc1..f72f6590cc 100644
--- a/org.adempiere.ui.swing/src/org/adempiere/client/Client.java
+++ b/org.adempiere.ui.swing/src/org/adempiere/client/Client.java
@@ -11,7 +11,7 @@ public class Client {
 		if (Core.isExtension(className))
 			className = className.substring(Core.OSGI_PREFIX.length());
 		ServiceQuery query = new ServiceQuery();
-		query.put("id", className);
+		query.put(ServiceQuery.EXTENSION_ID, className);
 		return Service.locate(FormPanel.class, "org.adempiere.apps.Form", query);
 	}