diff --git a/certy.ps1 b/certy.ps1
index 0ecd1d4..5e8d626 100644
--- a/certy.ps1
+++ b/certy.ps1
@@ -274,6 +274,9 @@ function Invoke-Replication {
                 if ($remoteCmd -match "(?i)\brepadmin\b" -and $remoteCmd -match "(?i)\bsyncall\b") {
                     $remoteCmd = [regex]::Replace($remoteCmd, "(?i)\brepadmin\s+/syncall\s+\S+", "repadmin /syncall")
                 }
+                $remoteCmd = [regex]::Replace($remoteCmd, "(?i)\brepadmin\s+/syncall\b", "repadmin /syncall")
+                $remoteCmd = $remoteCmd.Replace("/AdeP", "/AedP")
+                $remoteCmd = [regex]::Replace($remoteCmd, "\s{2,}", " ").Trim()
                 if ([string]::IsNullOrWhiteSpace($remoteCmd)) {
                     & $Log "Replication skipped: empty command for $server."
                     continue
@@ -638,7 +641,7 @@ $y += 70 + $gap
 
 Add-Label "Replication command ({server} optional)" $xLabel $y $labelWidth $rowHeight
 $replicationCmdBox = Add-TextBox $xInput $y $inputWidth $rowHeight $false
-$replicationCmdBox.Text = "repadmin /syncall {server} /AdeP"
+    $replicationCmdBox.Text = "repadmin /syncall /AedP"
 $y += $rowHeight + $gap
 
 Add-Label "Replication wait (seconds)" $xLabel $y $labelWidth $rowHeight