diff --git a/EDMDesigner/FrmConnection.vb b/EDMDesigner/FrmConnection.vb
index 43e7a8da..ec5c7a63 100644
--- a/EDMDesigner/FrmConnection.vb
+++ b/EDMDesigner/FrmConnection.vb
@@ -21,23 +21,15 @@ Public Class FrmConnection
         Try
             dbTest = New Firebird(LogConfig, My.Settings.fbDatasource, My.Settings.fbDatabaseLocation, My.Settings.fbUser, My.Settings.fbPassword)
 
-            If dbTest.ConnectionFailed Then
-                MsgBox("Connection failed!", MsgBoxStyle.Information, "Database Connection")
 
-                lblConnectionStatus.Text = "No connection established"
-                lblConnectionStatus.BackColor = Color.Red
+            My.Settings.Save()
 
-                DialogResult = DialogResult.None
-            Else
-                My.Settings.Save()
+            MsgBox("Connection successful!", MsgBoxStyle.Information, "Database Connection")
 
-                MsgBox("Connection successful!", MsgBoxStyle.Information, "Database Connection")
+            lblConnectionStatus.Text = "Connection established!"
+            lblConnectionStatus.BackColor = Color.GreenYellow
 
-                lblConnectionStatus.Text = "Connection established!"
-                lblConnectionStatus.BackColor = Color.GreenYellow
-
-                DialogResult = DialogResult.OK
-            End If
+            DialogResult = DialogResult.OK
         Catch ex As Exception
             MsgBox("Connection failed!", MsgBoxStyle.Information, "Database Connection")