diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CourseDesignerMode.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CourseDesignerMode.java
index 32f66797e7e..9fca52e32a3 100644
--- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CourseDesignerMode.java
+++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CourseDesignerMode.java
@@ -40,7 +40,7 @@ public enum CourseDesignerMode {
     public static CourseDesignerMode[] validValues() {
         List<CourseDesignerMode> validValues = new ArrayList<CourseDesignerMode>();
         for (CourseDesignerMode type : values()) {
-            if (type != UNKNOWN) {
+            if (type != UNKNOWN || type != ADMIN_CONSOLE) {
                 validValues.add(type);
             }
         }
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
index 74b616c42f5..048a5f9726b 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
@@ -132,7 +132,7 @@ public class AppPreferences {
     }
 
     public CourseDesignerMode getDefaultCourseDesignerMode() {
-        String mode = preferences.getString(key(R.string.preference_course_designer_override_key), "");
+        String mode = preferences.getString(key(R.string.preference_course_designer_override_key), "BY_NAME");
         return CourseDesignerMode.valueOf(mode);
     }