diff --git a/java/com.sap.sailing.gwt.ui/AdminConsole.html b/java/com.sap.sailing.gwt.ui/AdminConsole.html
index 182b6efdd40..d170f37244a 100644
--- a/java/com.sap.sailing.gwt.ui/AdminConsole.html
+++ b/java/com.sap.sailing.gwt.ui/AdminConsole.html
@@ -41,6 +41,73 @@
     <!-- be added before this line.                -->
     <!--                                           -->
     <script type="text/javascript" language="javascript" src="com.sap.sailing.gwt.ui.AdminConsole/com.sap.sailing.gwt.ui.AdminConsole.nocache.js"></script>
+
+	<!-- Loading Indicator -->
+    	<style type="text/css">
+	.loading {
+		position: absolute;
+		top: 80px;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		font-size: 120%;
+	}
+	.loading > .sapsailing {
+		margin: 40px;
+		color: #008fcc;
+		font-weight: bold;
+	}
+	.loading > .waitmessage {
+		margin: 60px 40px;
+	}
+	
+	.signal {
+	    border:3px solid #6a6a6a;
+	    border-radius: 50%;
+	    position: relative;
+	    height:300px;
+	    width:300px;
+	    margin: 0px auto;
+	    opacity:0;	 
+	    -webkit-animation: pulsate 2s ease-out;
+	            animation: pulsate 2s ease-out;
+	    -webkit-animation-iteration-count:infinite;
+	            animation-iteration-count:infinite;
+	    -webkit-transform: translate(-50%, -50%);
+	}
+
+	@-webkit-keyframes pulsate {
+	    0% {
+	      -webkit-transform:scale(.1);
+	              transform:scale(.1);
+	      opacity: 0.0;
+	    }
+	    50% {
+	      opacity:1;
+	    }
+	    100% {
+	      -webkit-transform:scale(1.2);
+	              transform:scale(1.2);
+	      opacity:0;
+	    }
+	}
+	
+	@keyframes pulsate {
+	    0% {
+	      -webkit-transform:scale(.1);
+	              transform:scale(.1);
+	      opacity: 0.0;
+	    }
+	    50% {
+	      opacity:1;
+	    }
+	    100% {
+	      -webkit-transform:scale(1.2);
+	              transform:scale(1.2);
+	      opacity:0;
+	    }
+	}
+	</style>
   </head>
 
   <!--                                           -->
@@ -61,5 +128,10 @@
       </div>
     </noscript>
 
+    	<div id="loading" class="loading">
+		<p class="sapsailing">SAP Sailing Analytics</p>
+		<p class="waitmessage">Loading, please wait...</p>
+		<div class="signal"></div>
+	</div>
   </body>
 </html>
diff --git a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html
index 440a01f45c2..7d41e6e92cc 100644
--- a/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html
+++ b/java/com.sap.sailing.gwt.ui/EmbeddedMapAndWindChart.html
@@ -24,6 +24,73 @@
     
     <script type="text/javascript" language="javascript" src="com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart/com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart.nocache.js"></script>
 
+	<!-- Loading Indicator -->
+    	<style type="text/css">
+	.loading {
+		position: absolute;
+		top: 80px;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		font-size: 120%;
+	}
+	.loading > .sapsailing {
+		margin: 40px;
+		color: #008fcc;
+		font-weight: bold;
+	}
+	.loading > .waitmessage {
+		margin: 60px 40px;
+	}
+	
+	.signal {
+	    border:3px solid #6a6a6a;
+	    border-radius: 50%;
+	    position: relative;
+	    height:300px;
+	    width:300px;
+	    margin: 0px auto;
+	    opacity:0;	 
+	    -webkit-animation: pulsate 2s ease-out;
+	            animation: pulsate 2s ease-out;
+	    -webkit-animation-iteration-count:infinite;
+	            animation-iteration-count:infinite;
+	    -webkit-transform: translate(-50%, -50%);
+	}
+
+	@-webkit-keyframes pulsate {
+	    0% {
+	      -webkit-transform:scale(.1);
+	              transform:scale(.1);
+	      opacity: 0.0;
+	    }
+	    50% {
+	      opacity:1;
+	    }
+	    100% {
+	      -webkit-transform:scale(1.2);
+	              transform:scale(1.2);
+	      opacity:0;
+	    }
+	}
+	
+	@keyframes pulsate {
+	    0% {
+	      -webkit-transform:scale(.1);
+	              transform:scale(.1);
+	      opacity: 0.0;
+	    }
+	    50% {
+	      opacity:1;
+	    }
+	    100% {
+	      -webkit-transform:scale(1.2);
+	              transform:scale(1.2);
+	      opacity:0;
+	    }
+	}
+	</style>
+
   </head>
   <body>
     
@@ -36,6 +103,11 @@
         in order for this application to display correctly.
       </div>
     </noscript>
-
+    
+    	<div id="loading" class="loading">
+		<p class="sapsailing">SAP Sailing Analytics</p>
+		<p class="waitmessage">Loading, please wait...</p>
+		<div class="signal"></div>
+	</div>
   </body>
 </html>
diff --git a/java/com.sap.sailing.gwt.ui/Home.html b/java/com.sap.sailing.gwt.ui/Home.html
index e4172f8e8a0..549a7c2e720 100644
--- a/java/com.sap.sailing.gwt.ui/Home.html
+++ b/java/com.sap.sailing.gwt.ui/Home.html
@@ -15,8 +15,8 @@
 	<script src="js/jquery-1.11.1.min.js"></script>
 	<link rel="stylesheet" type="text/css" href="js/jquery.slick/slick-1.5.8.css"/>
 	<script type="text/javascript"          src="js/jquery.slick/slick-1.5.8.min.js"></script>    
-    <link  href="js/video-js/video-js.css" rel="stylesheet">
-    <link  href="js/video-js/video-js-sapsailing.css" rel="stylesheet">
+        <link  href="js/video-js/video-js.css" rel="stylesheet">
+        <link  href="js/video-js/video-js-sapsailing.css" rel="stylesheet">
 	<script src="js/video-js/video.js"></script>
 	<script src="js/vjs.youtube.js"></script>
 	<script src="js/vjs.vimeo.js"></script>
diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java
index 235981885d6..658a86f04ad 100755
--- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java
+++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/AbstractSecureEntryPoint.java
@@ -1,6 +1,8 @@
 package com.sap.sse.security.ui.client;
 
 import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Element;
 import com.sap.sse.gwt.client.StringMessages;
 
 /**
@@ -15,8 +17,16 @@ import com.sap.sse.gwt.client.StringMessages;
 public abstract class AbstractSecureEntryPoint<S extends StringMessages> extends com.sap.sse.gwt.client.AbstractEntryPoint<S> implements WithSecurity {
     private WithSecurity securityProvider;
 
+    /**
+     * Initializes the {@link UserManagementService} and removes the optional loading indicator from the DOM which is
+     * identified by the "loading" ID.
+     */
     protected void doOnModuleLoad() {
         securityProvider = new DefaultWithSecurityImpl();
+        final Element optionalLoadingIndicator = Document.get().getElementById("loading");
+        if (optionalLoadingIndicator != null) {
+            optionalLoadingIndicator.removeFromParent();
+        }
     }
 
     @Override