diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/shiro.ini b/java/com.sap.sailing.gwt.ui/src/main/resources/shiro.ini
index 3e68ea8df3d..a0c8e232fed 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/shiro.ini
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/shiro.ini
@@ -25,7 +25,7 @@ securityManager.sessionManager = $sessionManager
 #securityManager.sessionManager.sessionIdCookie = $globalCookie
 
 authc = com.sap.sse.security.CustomFilter
-authc.loginUrl = ../security/ui/Login.html
+authc.loginUrl = ../security/ui/Login.html?app=Sailing%20Analytics
 authc.successUrl  = /security/ui/UserManagement.html
 
 roles.loginUrl = ../security/ui/Login.html
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginEntryPoint.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginEntryPoint.java
index 8496147728f..6801e61f40d 100644
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginEntryPoint.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginEntryPoint.java
@@ -1,25 +1,33 @@
 package com.sap.sse.security.ui.login;
 
 import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.google.gwt.user.client.ui.RootPanel;
 import com.sap.sse.gwt.client.AbstractEntryPoint;
 import com.sap.sse.gwt.client.EntryPointHelper;
 import com.sap.sse.security.ui.client.RemoteServiceMappingConstants;
 import com.sap.sse.security.ui.client.UserService;
+import com.sap.sse.security.ui.client.i18n.StringMessages;
 import com.sap.sse.security.ui.shared.UserManagementService;
 import com.sap.sse.security.ui.shared.UserManagementServiceAsync;
 
 public class LoginEntryPoint extends AbstractEntryPoint {
+    /**
+     * The URL parameter name used to pass an application name to this entry point. This name
+     * will be put into the login view's header.
+     */
+    private static final String PARAM_APP = "app";
     private UserManagementServiceAsync userManagementService;
     private UserService userService;
     
     @Override
     public void doOnModuleLoad() {
+        final String appName = Window.Location.getParameter(PARAM_APP);
         userManagementService = GWT.create(UserManagementService.class);
         EntryPointHelper.registerASyncService((ServiceDefTarget) userManagementService, RemoteServiceMappingConstants.userManagementServiceRemotePath);
         userService = new UserService(userManagementService);
         RootPanel rootPanel = RootPanel.get();
-        rootPanel.add(new LoginView(userManagementService, userService));
+        rootPanel.add(new LoginView(userManagementService, userService, appName==null?StringMessages.INSTANCE.signIn():appName));
     }
 }
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.java
index c966cfbc79c..412690ce38e 100644
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.java
@@ -13,6 +13,7 @@ import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.Composite;
 import com.google.gwt.user.client.ui.HTMLPanel;
+import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 import com.sap.sse.gwt.client.async.MarkedAsyncCallback;
 import com.sap.sse.security.shared.UserManagementException;
@@ -33,17 +34,19 @@ public class LoginView extends Composite {
     private final UserService userService;
     
     @UiField TextBoxWithWatermark userNameTextBox;
+    @UiField Label appName;
     @UiField Anchor forgotPasswordAnchor; 
     @UiField PasswordTextBoxWithWatermark passwordTextBox;
     @UiField Button loginButton;
     @UiField Anchor signUpAnchor;
     @UiField HTMLPanel oAuthPanel;
     
-    public LoginView(UserManagementServiceAsync userManagementService, UserService userService) {
+    public LoginView(UserManagementServiceAsync userManagementService, UserService userService, String appName) {
         this.userManagementService = userManagementService;
         this.userService = userService;
         LoginViewResources.INSTANCE.css().ensureInjected();
         initWidget(uiBinder.createAndBindUi(this));
+        this.appName.setText(appName);
         userNameTextBox.setWatermark(StringMessages.INSTANCE.username());
         passwordTextBox.setWatermark(StringMessages.INSTANCE.password());
         String registrationLink = EntryPointLinkFactory.createRegistrationLink(Collections.<String, String> emptyMap());
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.ui.xml b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.ui.xml
index ba3f7081ac7..4f917735f30 100644
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.ui.xml
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/login/LoginView.ui.xml
@@ -6,8 +6,9 @@
     <ui:with field="icon_res" type="com.sap.sse.security.ui.client.IconResources" />
     <ui:with field="local_res" type="com.sap.sse.security.ui.login.LoginViewResources" />
 	<g:HTMLPanel styleName="{local_res.css.loginform}">
-		<div class="{local_res.css.loginform_header}">
-		    <img src="{icon_res.sapLogo.getSafeUri}" />
+	    <div class="{local_res.css.loginform_header}">
+		<img src="{icon_res.sapLogo.getSafeUri}" />
+		<g:Label ui:field="appName" />
 	    </div>
 	    <div class="{local_res.css.loginform_content}">
 			    <div><ui:text from="{i18n.generalWelcome}" /></div>