diff --git a/src/panel/ACMEDomains.js b/src/panel/ACMEDomains.js
index 6cfc501..a7fb088 100644
--- a/src/panel/ACMEDomains.js
+++ b/src/panel/ACMEDomains.js
@@ -21,6 +21,8 @@ Ext.define('Proxmox.panel.ACMEDomains', {
     domainUsages: undefined,
     // if no domainUsages parameter is supllied, the orderUrl is required instead:
     orderUrl: undefined,
+    // Force the use of 'acmedomainX' properties.
+    separateDomainEntries: undefined,
 
     acmeUrl: undefined,
 
@@ -87,6 +89,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
 		acmeUrl: view.acmeUrl,
 		nodeconfig: view.nodeconfig,
 		domainUsages: view.domainUsages,
+		separateDomainEntries: view.separateDomainEntries,
 		apiCallDone: function() {
 		    me.reload();
 		},
@@ -105,6 +108,7 @@ Ext.define('Proxmox.panel.ACMEDomains', {
 		acmeUrl: view.acmeUrl,
 		nodeconfig: view.nodeconfig,
 		domainUsages: view.domainUsages,
+		separateDomainEntries: view.separateDomainEntries,
 		domain: selection[0].data,
 		apiCallDone: function() {
 		    me.reload();
diff --git a/src/window/ACMEDomains.js b/src/window/ACMEDomains.js
index 930a4c3..b040e33 100644
--- a/src/window/ACMEDomains.js
+++ b/src/window/ACMEDomains.js
@@ -16,6 +16,9 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
     // For PMG the we have multiple certificates, so we have a "usage" attribute & column.
     domainUsages: undefined,
 
+    // Force the use of 'acmedomainX' properties.
+    separateDomainEntries: undefined,
+
     cbindData: function(config) {
 	let me = this;
 	return {
@@ -50,7 +53,7 @@ Ext.define('Proxmox.window.ACMEDomainEdit', {
 		};
 
 		// If we have a 'usage' property (pmg), we only use the `acmedomainX` config keys.
-		if (win.domainUsages) {
+		if (win.separateDomainEntries || win.domainUsages) {
 		    if (!configkey || configkey === 'acme') {
 			configkey = find_free_slot();
 		    }