diff --git a/src/helma/servlet/EmbeddedServletClient.java b/src/helma/servlet/EmbeddedServletClient.java
index 67817fb5..e8d2a5e2 100644
--- a/src/helma/servlet/EmbeddedServletClient.java
+++ b/src/helma/servlet/EmbeddedServletClient.java
@@ -25,11 +25,21 @@ public final class EmbeddedServletClient extends AbstractServletClient {
     // depending on this we know whether we have to transform the request path
     boolean root;
 
+    public EmbeddedServletClient () {
+	super ();
+    }
+
     public EmbeddedServletClient (String appName, boolean isRoot) {
 	this.appName = appName;
 	this.root = isRoot;
     }
 
+    public void init (ServletConfig init) throws ServletException {
+	super.init (init);
+	String app = init.getInitParameter ("application");
+	if (app != null)
+	    appName = app;
+    }
 
     IRemoteApp getApp (String appID) {
 	if (app == null)