diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/LoginPage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/LoginPage.java
index ae8a7cbe8c8..96dde391bda 100755
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/LoginPage.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/LoginPage.java
@@ -23,7 +23,7 @@ public class LoginPage extends HostPage {
     public void login(String username, String password) {
         usernameField.clear();
         usernameField.sendKeys(username);
-        passwordField.clear();
+        passwordField.click();
         passwordField.sendKeys(password);
         loginButton.click();
     }
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
index b16ed34e950..0a42b545d08 100755
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
@@ -139,7 +139,7 @@ public class AdminConsolePage extends HostPage {
      */
     @Override
     protected void verify() {
-        if(!PAGE_TITLE.equals(this.driver.getTitle())) {
+        if (!PAGE_TITLE.equals(this.driver.getTitle())) {
             throw new IllegalStateException("This is not the administration console: " + this.driver.getTitle()); //$NON-NLS-1$
         }
     }
diff --git a/java/com.sap.sse.security/WEB-INF/web.xml b/java/com.sap.sse.security/WEB-INF/web.xml
index d84511c67f9..27c35fc2a95 100644
--- a/java/com.sap.sse.security/WEB-INF/web.xml
+++ b/java/com.sap.sse.security/WEB-INF/web.xml
@@ -30,15 +30,6 @@
 		<dispatcher>ERROR</dispatcher>
 	</filter-mapping>
     
-	<servlet>
-		<servlet-name>LoginServlet</servlet-name>
-		<servlet-class>com.sap.sse.security.LoginServlet</servlet-class>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>LoginServlet</servlet-name>
-		<url-pattern>/login</url-pattern>
-	</servlet-mapping>
-	
 	<servlet>
     	<servlet-name>Jersey REST API</servlet-name>
 		<servlet-class>com.sap.sse.security.jaxrs.RestServletContainer</servlet-class>
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/LoginServlet.java b/java/com.sap.sse.security/src/com/sap/sse/security/LoginServlet.java
deleted file mode 100644
index 05bc9580852..00000000000
--- a/java/com.sap.sse.security/src/com/sap/sse/security/LoginServlet.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.sap.sse.security;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class LoginServlet extends HttpServlet {
-    private static final long serialVersionUID = 3529983534556192982L;
-
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-        resp.getWriter().append("Hello!");
-    }
-
-    
-}