diff --git a/source/main.pas b/source/main.pas
index 05b456c8..23ba7a2d 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -1718,7 +1718,7 @@ begin
   // Open server-specific registry-folder.
   // relative from already opened folder!
   OpenRegistry(SessionName);
-  MainReg.WriteString( REGNAME_LASTUSEDDB, ActiveDatabase );
+  MainReg.WriteString( REGNAME_LASTUSEDDB, Connection.Database );
   MainReg.WriteString( REGNAME_ONLYDBS, comboOnlyDBs.Items.Text );
 
   // Post pending UPDATE