diff --git a/version/src/main/java/org/jboss/as/version/ProductConfig.java b/version/src/main/java/org/jboss/as/version/ProductConfig.java
index 76ee682dde7..b50e1a7fef6 100644
--- a/version/src/main/java/org/jboss/as/version/ProductConfig.java
+++ b/version/src/main/java/org/jboss/as/version/ProductConfig.java
@@ -26,7 +26,6 @@
 import java.util.stream.Collectors;
 
 import org.jboss.modules.Module;
-import org.jboss.modules.ModuleIdentifier;
 import org.jboss.modules.ModuleLoader;
 
 /**
@@ -224,7 +223,7 @@ public static String getPrettyVersionString(final String name, String version1,
     }
 
     private void setSystemProperties(final Properties propConfProps, final Map providedProperties) {
-        if (propConfProps.size() == 0) {
+        if (propConfProps.isEmpty()) {
             return;
         }
 
@@ -262,10 +261,10 @@ private static void safeClose(Closeable c) {
 
     private static class ProductConfProps {
         private final Properties miscProperties;
-        private final ModuleIdentifier productModuleId;
+        private final String productModuleId;
 
         private ProductConfProps(String slot) {
-            this.productModuleId = slot == null ? null : ModuleIdentifier.create("org.jboss.as.product", slot);
+            this.productModuleId = slot == null ? null : "main".equals(slot) ? "org.jboss.as.product" : "org.jboss.as.product:" + slot;
             this.miscProperties = new Properties();
         }