diff --git a/app/src/gambas3/.src/Connection/MConnection.module b/app/src/gambas3/.src/Connection/MConnection.module
index dadaa3587..87fe37d47 100644
--- a/app/src/gambas3/.src/Connection/MConnection.module
+++ b/app/src/gambas3/.src/Connection/MConnection.module
@@ -1,6 +1,6 @@
 ' Gambas module file
 
-Private $cPassword As New Collection
+Public Password As New Collection
 
 Public Sub InitFrom(hConn As Connection, hConfig As Object, sName As String, Optional bWithDatabase As Boolean)
   
@@ -25,11 +25,11 @@ Public Sub LoadPassword(sName As String, bDesktop As Boolean) As String
   
   Dim sPassword As String
   
-  sPassword = $cPassword[sName]
+  sPassword = Password[sName]
   If Not sPassword Then 
     If bDesktop Then
       sPassword = Desktop.Passwords[Project.Name &/ sName]
-      $cPassword[sName] = sPassword
+      Password[sName] = sPassword
     Endif
   Endif
   
@@ -39,7 +39,7 @@ End
 
 Public Sub SavePassword(sName As String, sPassword As String, bDesktop As Boolean)
   
-  $cPassword[sName] = sPassword
+  Password[sName] = sPassword
   If sPassword Then Desktop.Passwords[Project.Name &/ sName] = sPassword
   
 End
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index f0d897f91..e5366b69f 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -366,6 +366,8 @@ Public Function Open(sDir As String) As Boolean
 
   Inc Project.TimeStamp
 
+  MConnection.Password.Clear
+
   Refresh
   
   DefineStartup(Startup, True)