diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/CourseConfigurationApi.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/CourseConfigurationApi.java
index 1e721b95a73..cdbcd910186 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/CourseConfigurationApi.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/coursetemplate/CourseConfigurationApi.java
@@ -20,14 +20,16 @@ public class CourseConfigurationApi {
 
     public CourseConfiguration createCourseConfigurationFromCourseTemplate(final ApiContext ctx,
             final UUID courseTemplateId, final String optionalRegattaName, final Iterable<String> tags) {
-        final String url = COURSE_CONFIGURATION + FROM_COURSE_TEMPLATE + courseTemplateId.toString()
-                + (optionalRegattaName != null ? "?regattaName=" + optionalRegattaName : "");
+        final String url = COURSE_CONFIGURATION + FROM_COURSE_TEMPLATE + courseTemplateId.toString();
         final Map<String, String> queryParams = new TreeMap<>();
         if (tags != null) {
             for (String tag : tags) {
                 queryParams.put(PARAM_TAG, tag);
             }
         }
+        if (optionalRegattaName != null) {
+            queryParams.put("regattaName", optionalRegattaName);
+        }
         final JSONObject result = ctx.get(url, queryParams);
         return new CourseConfiguration(result);
     }