diff --git a/BTCPayServer.Data/Data/ApplicationDbContextFactory.cs b/BTCPayServer.Data/Data/ApplicationDbContextFactory.cs
index e4d0786b2..55f24bed8 100644
--- a/BTCPayServer.Data/Data/ApplicationDbContextFactory.cs
+++ b/BTCPayServer.Data/Data/ApplicationDbContextFactory.cs
@@ -91,10 +91,10 @@ namespace BTCPayServer.Data
                 builder.UseSqlite(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data"));
             else if (_Type == DatabaseType.Postgres)
                 builder
-                    .UseNpgsql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data"))
+                    .UseNpgsql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data").EnableRetryOnFailure(10))
                     .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
             else if (_Type == DatabaseType.MySQL)
-                builder.UseMySql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data"));
+                builder.UseMySql(_ConnectionString, o => o.MigrationsAssembly("BTCPayServer.Data").EnableRetryOnFailure(10));
         }
     }
 }
diff --git a/BTCPayServer.Tests/SeleniumTests.cs b/BTCPayServer.Tests/SeleniumTests.cs
index 98e94a6fe..4d3f2dcbb 100644
--- a/BTCPayServer.Tests/SeleniumTests.cs
+++ b/BTCPayServer.Tests/SeleniumTests.cs
@@ -291,7 +291,7 @@ namespace BTCPayServer.Tests
                 s.Driver.FindElement(By.CssSelector("div.note-editable.card-block")).SendKeys("1BTC = 1BTC");
                 s.Driver.FindElement(By.Id("TargetCurrency")).SendKeys("JPY");
                 s.Driver.FindElement(By.Id("TargetAmount")).SendKeys("700");
-                s.Driver.FindElement(By.Id("SaveSettings")).Submit();
+                s.Driver.FindElement(By.Id("SaveSettings")).ForceClick();
                 s.Driver.FindElement(By.Id("ViewApp")).ForceClick();
                 s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
                 Assert.True(s.Driver.PageSource.Contains("Currently Active!"), "Unable to create CF");
@@ -314,7 +314,7 @@ namespace BTCPayServer.Tests
                 s.Driver.FindElement(By.Id("Title")).SendKeys("Pay123");
                 s.Driver.FindElement(By.Id("Amount")).SendKeys("700");
                 s.Driver.FindElement(By.Id("Currency")).SendKeys("BTC");
-                s.Driver.FindElement(By.Id("SaveButton")).Submit();
+                s.Driver.FindElement(By.Id("SaveButton")).ForceClick();
                 s.Driver.FindElement(By.Name("ViewAppButton")).SendKeys(Keys.Return);
                 s.Driver.SwitchTo().Window(s.Driver.WindowHandles.Last());
                 Assert.True(s.Driver.PageSource.Contains("Amount due"), "Unable to create Payment Request");
diff --git a/BTCPayServer/Services/DynamicDnsSettings.cs b/BTCPayServer/Services/DynamicDnsSettings.cs
index 71360cee6..d840fb034 100644
--- a/BTCPayServer/Services/DynamicDnsSettings.cs
+++ b/BTCPayServer/Services/DynamicDnsSettings.cs
@@ -16,6 +16,10 @@ namespace BTCPayServer.Services
     public class DynamicDnsSettings
     {
         public List<DynamicDnsService> Services { get; set; } = new List<DynamicDnsService>();
+        public override string ToString()
+        {
+            return String.Empty;
+        }
     }
     public class DynamicDnsService
     {