diff --git a/applications/uddi-server/src/webapp/WEB-INF/web.xml b/applications/uddi-server/src/webapp/WEB-INF/web.xml
index 0b6cdd8a59..a874080b83 100644
--- a/applications/uddi-server/src/webapp/WEB-INF/web.xml
+++ b/applications/uddi-server/src/webapp/WEB-INF/web.xml
@@ -23,6 +23,11 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
+    <!-- Welcome File List -->
+    <welcome-file-list>
+        <welcome-file>happyjuddi.jsp</welcome-file>
+    </welcome-file-list>
+
     <!--
       This Servlet is used to create, initialize and cleanup
       resources used by jUDDI. It ABSOLUTELY MUST be loaded first.
diff --git a/applications/uddi-server/src/webapp/happyjuddi.jsp b/applications/uddi-server/src/webapp/happyjuddi.jsp
index 0ddc356389..d65ae07876 100644
--- a/applications/uddi-server/src/webapp/happyjuddi.jsp
+++ b/applications/uddi-server/src/webapp/happyjuddi.jsp
@@ -266,7 +266,10 @@
       throw new Exception("No Context");
 
     out.print("<font color=\"green\">");
+    /** Removed to avoid a security risk in exposing a DS name
     out.print("+ Got a JDBC DataSource (dsname="+dsname+")");
+    **/
+    out.print("+ Got a JDBC DataSource!");
     out.println("</font>");
   }
   catch(Exception ex)
@@ -315,7 +318,7 @@
 %>
 </pre>
 
-
+<!-- removed to avoid exposing internal system properties to unauth user
 <h4>System Properties</h4>
 <pre>
 <%
@@ -335,6 +338,7 @@
   }
 %>
 </pre>
+-->
 
 <hr>
 Platform: <%= getServletConfig().getServletContext().getServerInfo() %>
@@ -345,4 +349,4 @@ Platform: <%= getServletConfig().getServletContext().getServerInfo() %>
 
 </body>
 </div>
-</html>
\ No newline at end of file
+</html>
diff --git a/configs/uddi-tomcat/src/plan/plan.xml b/configs/uddi-tomcat/src/plan/plan.xml
index 383b7d0ddb..2836dac2de 100644
--- a/configs/uddi-tomcat/src/plan/plan.xml
+++ b/configs/uddi-tomcat/src/plan/plan.xml
@@ -21,7 +21,7 @@
     configId="${pom.groupId}/${pom.artifactId}/${pom.currentVersion}/car">
 
     <ext-module>
-        <web>uddi-jetty</web>
+        <web>uddi-tomcat</web>
         <external-path>geronimo/geronimo-uddi-server/${pom.currentVersion}/war</external-path>
         <web-app
             xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"