diff --git a/src/helma/main/ApplicationManager.java b/src/helma/main/ApplicationManager.java
index dffef753..75ebdc09 100644
--- a/src/helma/main/ApplicationManager.java
+++ b/src/helma/main/ApplicationManager.java
@@ -90,7 +90,6 @@ public class ApplicationManager implements XmlRpcHandler {
                         ndesc.app = appDesc.app;
                         ndesc.bind();
                         descriptors.put(ndesc.appName, ndesc);
-
                     }
                 }
             } catch (Exception mx) {
@@ -371,6 +370,11 @@ public class ApplicationManager implements XmlRpcHandler {
                     Naming.rebind("//:" + rmiPort + "/" + appName, new RemoteApplication(app));
                 }
 
+                // set application URL prefix if it isn't set in app.properties
+                if (!app.hasExplicitBaseURI()) {
+                    app.setBaseURI(mountpoint);
+                }
+
                 // bind to Jetty HTTP server
                 if (server.http != null) {