diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index a5d5c7d72d3..49b6b0c7a27 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -6478,8 +6478,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet
         boolean successful = getService().getTaggingService().addTag(leaderboardName, raceColumnName, fleetName, tag,
                 comment, imageURL, visibleForPublic, raceTimepoint);
         if (!successful) {
-            successInfo = new SuccessInfo(false, getService().getTaggingService().getLastErrorCode().getMessage(), null,
-                    null);
+            String message = serverStringMessages.get(getClientLocale(),
+                    getService().getTaggingService().getLastErrorCode().getCode());
+            successInfo = new SuccessInfo(false, message, null, null);
         }
         return successInfo;
     }
@@ -6490,8 +6491,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet
         boolean successful = getService().getTaggingService().removeTag(leaderboardName, raceColumnName, fleetName,
                 tag);
         if (!successful) {
-            successInfo = new SuccessInfo(false, getService().getTaggingService().getLastErrorCode().getMessage(), null,
-                    null);
+            String message = serverStringMessages.get(getClientLocale(),
+                    getService().getTaggingService().getLastErrorCode().getCode());
+            successInfo = new SuccessInfo(false, message, null, null);
         }
         return successInfo;
     }
@@ -6503,8 +6505,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet
         boolean successful = getService().getTaggingService().updateTag(leaderboardName, raceColumnName, fleetName,
                 tagToUpdate, tag, comment, imageURL, visibleForPublic);
         if (!successful) {
-            successInfo = new SuccessInfo(false, getService().getTaggingService().getLastErrorCode().getMessage(), null,
-                    null);
+            String message = serverStringMessages.get(getClientLocale(),
+                    getService().getTaggingService().getLastErrorCode().getCode());
+            successInfo = new SuccessInfo(false, message, null, null);
         }
         return successInfo;
     }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages.properties
index 47c529b9626..94d808c4a66 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages.properties
@@ -2,4 +2,16 @@ slicingCannotSliceRace=Can not slice race
 slicingRaceColumnAlreadyUsedThe=Race column name is already used in the given regatta
 slicingTimeRangeOutOfBounds=The TimeRange to slice is not part of the race
 slicingCouldNotObtainRace=Could not obtain sliced race
-slicingError=Error slicing race
\ No newline at end of file
+slicingError=Error slicing race
+unknownError=Unknown error
+notLoggedIn=You are not logged in
+missingPermissions=Missing permissions
+securityServiceNotFound=Security service not found
+racelogNotFound=Racelog not found
+tagNotRevokable=This tag cannot be revoked
+tagAlreadyExists=Tag does already exist, duplicated tags are not allowed
+tagAlreadyRemoved=Tag cannot be removed twice!
+tagNotEmpty=Tag may not be empty
+timepointNotEmpty=Timepoint may not be empty
+tagTooLong=Tag is too long
+commentToLong=Comment is too long
\ No newline at end of file
diff --git a/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages_de.properties
index 456ecd8cddf..70ac998573c 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages_de.properties
+++ b/java/com.sap.sailing.gwt.ui/src/main/resources/stringmessages/StringMessages_de.properties
@@ -2,4 +2,16 @@ slicingCannotSliceRace=Rennen kann nicht geschnitten werden
 slicingRaceColumnAlreadyUsedThe=Der Rennspaltenname ist in der Regatta bereits verwendet
 slicingTimeRangeOutOfBounds=Die angegebene Zeitspanne ist ausserhalb des Rennens
 slicingCouldNotObtainRace=Das geschnittene Rennen konnte nicht gefunden werden
-slicingError=Fehler beim Schneiden des Rennens
\ No newline at end of file
+slicingError=Fehler beim Schneiden des Rennens
+unknownError=Unbekannter Fehler
+notLoggedIn=Du bist nicht eingeloggt
+missingPermissions=Fehlende Berechtigung
+securityServiceNotFound=Sicherheits-Service konnte nicht gefunden werden
+racelogNotFound=Racelog konnte nicht gefunden werden
+tagNotRevokable=Dieser Tag ist nicht umkehrbar
+tagAlreadyExists=Dieser Tag existiert bereits
+tagAlreadyRemoved=Dieser Tag wurde bereits geloescht
+tagNotEmpty=Der Tag darf nicht leer sein
+timepointNotEmpty=Der Zeitpunkt darf nicht leer sein
+tagTooLong=Der Tag ist zu lang
+commentToLong=Der Kommentar ist zu lang
\ No newline at end of file
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingService.java
index 947fa0e2b1f..df8183a4bac 100644
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingService.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingService.java
@@ -14,7 +14,7 @@ public interface TaggingService {
      */
     public enum ErrorCode {
         UNKNOWN_ERROR("unknownError", "Unknown error"),
-        NOT_LOGGED_IN("notLoggedin", "You are not logged in"),
+        NOT_LOGGED_IN("notLoggedIn", "You are not logged in"),
         MISSING_PERMISSIONS("missingPermissions", "Missing permissions"),
         SECURITY_SERIVCE_NOT_FOUND("securityServiceNotFound", "Security service not found"),
         RACELOG_NOT_FOUND("racelogNotFound", "Racelog not found"),