diff --git a/src/main/java/com/faforever/api/map/MapService.java b/src/main/java/com/faforever/api/map/MapService.java
index 3b72f09e3..890136cf3 100644
--- a/src/main/java/com/faforever/api/map/MapService.java
+++ b/src/main/java/com/faforever/api/map/MapService.java
@@ -97,7 +97,7 @@ public MapNameValidationResponse requestMapNameValidation(String mapName) {
         .mapToInt(MapVersion::getVersion)
         .max()
         .orElse(1))
-      .orElse(1);
+      .orElse(2);
 
     return MapNameValidationResponse.builder()
       .displayName(mapNameBuilder.getDisplayName())
diff --git a/src/main/resources/templates/validate_map_metadata.html b/src/main/resources/templates/validate_map_metadata.html
index 63f80d809..338aa2626 100644
--- a/src/main/resources/templates/validate_map_metadata.html
+++ b/src/main/resources/templates/validate_map_metadata.html
@@ -20,7 +20,7 @@
                   .done(function (msg) {
                       $("#mapNameBlock").append('<table class="result">' +
                           '<tr class="alert alert-success"><th>Map name</th><td>' + msg.displayName + '</td></tr>' +
-                          '<tr class="alert alert-success"><th>Next version</th><td>' + (parseInt(msg.nextVersion, 10) + 1) + '</td></tr>' +
+                          '<tr class="alert alert-success"><th>Next version</th><td>' + msg.nextVersion + '</td></tr>' +
                           '<tr class="alert alert-success"><th>Folder name</th><td>' + msg.folderName + '</td></tr>' +
                           '<tr class="alert alert-success"><th>File names</th><td>' + Object.entries(msg.fileNames).map(arr => arr[1]).join(', ') + '</td></tr>' +
                           '</table>');