diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
index d366988..734269d 100644
--- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
+++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/pom.xml
@@ -145,17 +145,17 @@
             Using jetty 8 as supporting java 6. Other specs cft. http://www.eclipse.org/jetty/documentation/9.3.0.v20150612/what-jetty-version.html
             -->
             <plugin>
-              <groupId>org.mortbay.jetty</groupId>
-              <artifactId>jetty-maven-plugin</artifactId>
-              <version>8.1.16.v20140903</version>
+               <groupId>org.mortbay.jetty</groupId>
+               <artifactId>jetty-maven-plugin</artifactId>
+               <version>8.1.16.v20140903</version>
               <configuration>
                 <scanIntervalSeconds>10</scanIntervalSeconds>
                 <dumpOnStart>true</dumpOnStart>
-                <httpConnector>
-                    <port>8081</port>
-                    <host>localhost</host>
-                    <idleTimeout>60000</idleTimeout>
-                </httpConnector>
+                <connectors>
+                <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                  <port>8081</port>
+                </connector>
+                </connectors>
                 <!--webApp>
                   <contextPath>/app</contextPath>
                 </webApp-->
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
index 6d721f9..20aa128 100644
--- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
+++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/conf/componentConfiguration.xml
@@ -56,6 +56,9 @@
     <modelManager/>
     <aclFactory/>
     
+    <!--  More Fulcrum Components, e.g. json, XmlRpcServerComponent, cft. Fulcrum Component Configurations
+    -->
+    
      <userManager> 
        <className>org.apache.fulcrum.security.torque.om.TorqueTurbineUser</className>
     </userManager>
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Index.vm b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Index.vm
index 02b21e4..fdc5dcd 100644
--- a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Index.vm
+++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Index.vm
@@ -25,3 +25,17 @@
 You can (and should!) change or remove this page at any time. It is
 intended to give you immediate feedback if you just deployed an newly
 setup Turbine application.</p>
+
+Login here
+
+<form method="post" enctype="application/x-www-form-urlencoded" name="loginForm" id="loginForm">
+  <fieldset>
+    <legend>Login</legend>
+    <input name="action" type="hidden" value="LoginUser">
+   <label for="username">Username</label>
+    <input type="text" id="username" name="username" value="" tabindex="1" autocomplete="off" autofocus="">
+    <label for="password">Password</label>
+    <input type="password" id="password" name="password" value="" tabindex="2" autocomplete="off"> 
+    <input type="submit" id="submitLogin" value="Login" tabindex="3">
+ </fieldset>
+</form>
diff --git a/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Login.vm b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Login.vm
new file mode 100644
index 0000000..a5fc2b7
--- /dev/null
+++ b/trunk/turbine-webapp-4.0/src/main/resources/archetype-resources/src/main/webapp/templates/screens/Login.vm
@@ -0,0 +1,28 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+
+<div align="center"><h1>Welcome </h1></div>
+User created : $data.user.createDate
+User lastLogin : $data.user.lastLogin
+<form method="post" name="logoutForm" id="logoutForm">
+  <fieldset>
+    <legend>Logout</legend>
+    <input name="action" type="hidden" value="LogoutUser">
+    <input type="submit" id="submitLogout" value="Logout" tabindex="1">
+ </fieldset>
+</form>
+