diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 97c9216fda..ff400e19e8 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -293,10 +293,12 @@
 		     <param name="feature"
 		          value="com.raytheon.uf.viz.thinclient.feature" />
 		</antcall>
+		<!--
 		<antcall target="p2.build.repo">
 	             <param name="feature"
 	                  value="com.raytheon.uf.viz.useradmin.feature" />
 		</antcall>
+		-->
         <antcall target="p2.build.repo">
              <param name="feature"
                   value="com.raytheon.uf.viz.registry.feature" />
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 6866339f2a..28425ca5c1 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -133,10 +133,6 @@
          id="com.raytheon.uf.viz.thinclient.feature"
          version="0.0.0"/>
 
-   <includes
-         id="com.raytheon.uf.viz.useradmin.feature"
-         version="0.0.0"/>
-
    <includes
          id="com.raytheon.uf.viz.kml.export.feature"
          version="0.0.0"/>
@@ -172,6 +168,10 @@
    <includes
          id="com.raytheon.uf.viz.collaboration.feature"
          version="0.0.0"/>
+		 
+	<includes
+         id="com.raytheon.uf.viz.useradmin.feature"
+         version="0.0.0"/>
 	-->
    <includes
          id="com.raytheon.uf.viz.gisdatastore.feature"