diff --git a/Ginger/GingerCoreNET/Database/DatabaseOperations.cs b/Ginger/GingerCoreNET/Database/DatabaseOperations.cs
index 92cca1570..f6a34fa98 100644
--- a/Ginger/GingerCoreNET/Database/DatabaseOperations.cs
+++ b/Ginger/GingerCoreNET/Database/DatabaseOperations.cs
@@ -489,11 +489,14 @@ public Boolean Connect(bool displayErrorPopup = false)
                             Password = EncryptionHandler.DecryptwithKey(PassCalculated)
                         };
                         if (port1.HasValue) my.Port = port1.Value;
-                        Database.ConnectionString = my.ConnectionString;
+                        if (string.IsNullOrEmpty(ConnectionStringCalculated))
+                        {
+                            Database.ConnectionString = my.ConnectionString;
+                        }
 
                         oConn = new MySqlConnection
                         {
-                            ConnectionString = my.ConnectionString
+                            ConnectionString = GetConnectionString()
                         };
                         oConn.Open();
                         break;