diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
index fbf6a36e436..e8471010fc5 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
@@ -370,10 +370,10 @@ public class AdminConsoleEntryPoint extends AbstractEntryPoint implements Regatt
     }
     
     private boolean isUserInRole(UserRoles[] roles) {
-        boolean result = true;
+        boolean result = false;
         UserDTO user = getUserService().getCurrentUser();
         for (UserRoles enabledRole : roles) {
-            if (user.hasRole(enabledRole.name())) {
+            if (user.hasRole(enabledRole.getRolename())) {
                 result = true;
                 break;
             }
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 e1d6b545254..235e49630ca 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
@@ -40,6 +40,6 @@ securityManager.cacheManager = $cacheManager
 # login submissions. It is 'smart' enough to allow those requests through as specified by the
 # shiro.loginUrl above.
 
-/security/ui/UserManagement.html = authc,roles[admin]
-/LeaderboardEditing.html = authc,roles[admin]
-/AdminConsole.html = authc,roles[admin]
+/security/ui/UserManagement.html = roles[admin]
+/LeaderboardEditing.html = roles[admin],roles[eventmanager]
+/AdminConsole.html = roles[admin],roles[eventmanager]
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
index 362bf8a57c6..61622e03958 100644
--- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java
@@ -357,7 +357,7 @@ public class SecurityServiceImpl extends RemoteServiceServlet implements Securit
                 url.append(e.getValue());
             }
             sendMail(user.getName(), "e-Mail Validation",
-                    "Please click on the link below to validate your e-mail address.\n   "+url.toString());
+                    "Please click on the link below to validate your e-mail address for user "+user.getName()+".\n   "+url.toString());
         } catch (UnsupportedEncodingException e) {
             logger.log(Level.SEVERE,
                     "Internal error: encoding UTF-8 not found. Couldn't send e-mail to user " + user.getName()