diff --git a/src/renderer/components/DatabaseConnectPanel.vue b/src/renderer/components/DatabaseConnectPanel.vue
index 877205a9..18b6c67c 100644
--- a/src/renderer/components/DatabaseConnectPanel.vue
+++ b/src/renderer/components/DatabaseConnectPanel.vue
@@ -17,20 +17,30 @@
             </button>
          </div>
       </div>
+      <ModalAskCredentials
+         v-if="isAsking"
+         @closeAsking="closeAsking"
+         @credentials="continueTest"
+      />
    </div>
 </template>
 
 <script>
 import { mapActions } from 'vuex';
+import ModalAskCredentials from '@/components/ModalAskCredentials';
 
 export default {
    name: 'DatabaseConnectPanel',
+   components: {
+      ModalAskCredentials
+   },
    props: {
       connection: Object
    },
    data () {
       return {
-         isConnecting: false
+         isConnecting: false,
+         isAsking: false
       };
    },
    methods: {
@@ -40,7 +50,22 @@ export default {
       }),
       async startConnection () {
          this.isConnecting = true;
-         await this.connectWorkspace(this.connection);
+
+         if (this.connection.ask)
+            this.isAsking = true;
+         else {
+            await this.connectWorkspace(this.connection);
+            this.isConnecting = false;
+         }
+      },
+      async continueTest (credentials) { // if "Ask for credentials" is true
+         this.isAsking = false;
+         const params = Object.assign({}, this.connection, credentials);
+         await this.connectWorkspace(params);
+         this.isConnecting = false;
+      },
+      closeAsking () {
+         this.isAsking = false;
          this.isConnecting = false;
       }
    }
diff --git a/src/renderer/components/ModalAskCredentials.vue b/src/renderer/components/ModalAskCredentials.vue
index 0d22d159..8a0dc67c 100644
--- a/src/renderer/components/ModalAskCredentials.vue
+++ b/src/renderer/components/ModalAskCredentials.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="modal active modal-sm">
       <a class="modal-overlay" />
-      <div class="modal-container">
+      <div class="modal-container p-0">
          <div class="modal-header text-light">
             <div class="modal-title h6">
                Credentials
diff --git a/src/renderer/components/ModalEditConnection.vue b/src/renderer/components/ModalEditConnection.vue
index 6ac245a9..66de4c1f 100644
--- a/src/renderer/components/ModalEditConnection.vue
+++ b/src/renderer/components/ModalEditConnection.vue
@@ -146,24 +146,16 @@ export default {
          },
          isTesting: false,
          isAsking: false,
-         connectionProxy: null
+         localConnection: null
       };
    },
    computed: {
       ...mapGetters({
          connection: 'connections/getSelectedConnection'
-      }),
-      localConnection: {
-         get () {
-            if (this.connectionProxy === null)
-               return Object.assign({}, this.connection);
-            else
-               return this.connectionProxy;
-         },
-         set (val) {
-            this.connectionProxy = val;
-         }
-      }
+      })
+   },
+   created () {
+      this.localConnection = Object.assign({}, this.connection);
    },
    methods: {
       ...mapActions({
diff --git a/src/renderer/components/ModalNewConnection.vue b/src/renderer/components/ModalNewConnection.vue
index 05aa2dd8..f918f2f3 100644
--- a/src/renderer/components/ModalNewConnection.vue
+++ b/src/renderer/components/ModalNewConnection.vue
@@ -210,6 +210,7 @@ export default {
       async continueTest (credentials) { // if "Ask for credentials" is true
          this.isAsking = false;
          const params = Object.assign({}, this.connection, credentials);
+
          try {
             const res = await Connection.makeTest(params);
             if (res.status === 'error')