diff --git a/DDUserManager/DDUserManager/DDUserManager.vbproj b/DDUserManager/DDUserManager/DDUserManager.vbproj
index ae0d26a..84fc584 100644
--- a/DDUserManager/DDUserManager/DDUserManager.vbproj
+++ b/DDUserManager/DDUserManager/DDUserManager.vbproj
@@ -247,6 +247,7 @@
     <None Include="Resources\arrow_refresh.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\database_connect.png" />
     <Content Include="user.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
diff --git a/DDUserManager/DDUserManager/My Project/Resources.Designer.vb b/DDUserManager/DDUserManager/My Project/Resources.Designer.vb
index 6a57924..79033de 100644
--- a/DDUserManager/DDUserManager/My Project/Resources.Designer.vb	
+++ b/DDUserManager/DDUserManager/My Project/Resources.Designer.vb	
@@ -110,6 +110,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property database_connect() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("database_connect", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
diff --git a/DDUserManager/DDUserManager/My Project/Resources.resx b/DDUserManager/DDUserManager/My Project/Resources.resx
index 1b1e87d..cbdd2b7 100644
--- a/DDUserManager/DDUserManager/My Project/Resources.resx	
+++ b/DDUserManager/DDUserManager/My Project/Resources.resx	
@@ -121,20 +121,8 @@
   <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="group_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\group_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,19 +130,34 @@
   <data name="user_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="user_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="key" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="group" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="book" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\book.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="disk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="arrow_left_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_left_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="plugin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\plugin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cog" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cog.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="database_connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/DDUserManager/DDUserManager/Resources/database_connect.png b/DDUserManager/DDUserManager/Resources/database_connect.png
new file mode 100644
index 0000000..3a11197
Binary files /dev/null and b/DDUserManager/DDUserManager/Resources/database_connect.png differ
diff --git a/DDUserManager/DDUserManager/frmConfigDatabase.Designer.vb b/DDUserManager/DDUserManager/frmConfigDatabase.Designer.vb
index 45b462c..d6b89a8 100644
--- a/DDUserManager/DDUserManager/frmConfigDatabase.Designer.vb
+++ b/DDUserManager/DDUserManager/frmConfigDatabase.Designer.vb
@@ -22,11 +22,6 @@ Partial Class frmConfigDatabase
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfigDatabase))
-        Me.lblLinkedServer = New System.Windows.Forms.Label()
-        Me.txtLinkedServer = New System.Windows.Forms.TextBox()
-        Me.rbConn_Proxy = New System.Windows.Forms.RadioButton()
-        Me.rbConnDefault = New System.Windows.Forms.RadioButton()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.cmbDatenbank = New System.Windows.Forms.ComboBox()
@@ -39,57 +34,13 @@ Partial Class frmConfigDatabase
         Me.txtUser = New System.Windows.Forms.TextBox()
         Me.txtPasswort = New System.Windows.Forms.TextBox()
         Me.BtnConnect = New System.Windows.Forms.Button()
-        Me.btndeleteProxy = New System.Windows.Forms.Button()
         Me.SuspendLayout()
         '
-        'lblLinkedServer
-        '
-        Me.lblLinkedServer.AutoSize = True
-        Me.lblLinkedServer.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.lblLinkedServer.Location = New System.Drawing.Point(9, 180)
-        Me.lblLinkedServer.Name = "lblLinkedServer"
-        Me.lblLinkedServer.Size = New System.Drawing.Size(116, 13)
-        Me.lblLinkedServer.TabIndex = 69
-        Me.lblLinkedServer.Text = "Name/IP Proxy-Server:"
-        Me.lblLinkedServer.Visible = False
-        '
-        'txtLinkedServer
-        '
-        Me.txtLinkedServer.Location = New System.Drawing.Point(12, 196)
-        Me.txtLinkedServer.Name = "txtLinkedServer"
-        Me.txtLinkedServer.Size = New System.Drawing.Size(288, 20)
-        Me.txtLinkedServer.TabIndex = 68
-        Me.txtLinkedServer.Visible = False
-        '
-        'rbConn_Proxy
-        '
-        Me.rbConn_Proxy.AutoSize = True
-        Me.rbConn_Proxy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.rbConn_Proxy.Location = New System.Drawing.Point(144, 18)
-        Me.rbConn_Proxy.Name = "rbConn_Proxy"
-        Me.rbConn_Proxy.Size = New System.Drawing.Size(108, 17)
-        Me.rbConn_Proxy.TabIndex = 66
-        Me.rbConn_Proxy.Text = "Proxy Connection"
-        Me.rbConn_Proxy.UseVisualStyleBackColor = True
-        '
-        'rbConnDefault
-        '
-        Me.rbConnDefault.AutoSize = True
-        Me.rbConnDefault.Checked = True
-        Me.rbConnDefault.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.rbConnDefault.Location = New System.Drawing.Point(12, 18)
-        Me.rbConnDefault.Name = "rbConnDefault"
-        Me.rbConnDefault.Size = New System.Drawing.Size(116, 17)
-        Me.rbConnDefault.TabIndex = 65
-        Me.rbConnDefault.TabStop = True
-        Me.rbConnDefault.Text = "Default Connection"
-        Me.rbConnDefault.UseVisualStyleBackColor = True
-        '
         'chkbxUserAut
         '
         Me.chkbxUserAut.AutoSize = True
         Me.chkbxUserAut.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.chkbxUserAut.Location = New System.Drawing.Point(514, 60)
+        Me.chkbxUserAut.Location = New System.Drawing.Point(514, 33)
         Me.chkbxUserAut.Name = "chkbxUserAut"
         Me.chkbxUserAut.Size = New System.Drawing.Size(151, 17)
         Me.chkbxUserAut.TabIndex = 64
@@ -100,7 +51,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label5.AutoSize = True
         Me.Label5.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label5.Location = New System.Drawing.Point(9, 139)
+        Me.Label5.Location = New System.Drawing.Point(9, 112)
         Me.Label5.Name = "Label5"
         Me.Label5.Size = New System.Drawing.Size(135, 13)
         Me.Label5.TabIndex = 63
@@ -109,7 +60,7 @@ Partial Class frmConfigDatabase
         'cmbDatenbank
         '
         Me.cmbDatenbank.FormattingEnabled = True
-        Me.cmbDatenbank.Location = New System.Drawing.Point(12, 106)
+        Me.cmbDatenbank.Location = New System.Drawing.Point(12, 79)
         Me.cmbDatenbank.Name = "cmbDatenbank"
         Me.cmbDatenbank.Size = New System.Drawing.Size(288, 21)
         Me.cmbDatenbank.TabIndex = 56
@@ -118,7 +69,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label4.AutoSize = True
         Me.Label4.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label4.Location = New System.Drawing.Point(9, 86)
+        Me.Label4.Location = New System.Drawing.Point(9, 59)
         Me.Label4.Name = "Label4"
         Me.Label4.Size = New System.Drawing.Size(63, 13)
         Me.Label4.TabIndex = 61
@@ -128,7 +79,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label1.AutoSize = True
         Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label1.Location = New System.Drawing.Point(9, 38)
+        Me.Label1.Location = New System.Drawing.Point(9, 11)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(72, 13)
         Me.Label1.TabIndex = 58
@@ -138,7 +89,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label2.AutoSize = True
         Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label2.Location = New System.Drawing.Point(303, 38)
+        Me.Label2.Location = New System.Drawing.Point(303, 11)
         Me.Label2.Name = "Label2"
         Me.Label2.Size = New System.Drawing.Size(78, 13)
         Me.Label2.TabIndex = 59
@@ -148,7 +99,7 @@ Partial Class frmConfigDatabase
         '
         Me.Label3.AutoSize = True
         Me.Label3.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.Label3.Location = New System.Drawing.Point(427, 38)
+        Me.Label3.Location = New System.Drawing.Point(427, 11)
         Me.Label3.Name = "Label3"
         Me.Label3.Size = New System.Drawing.Size(53, 13)
         Me.Label3.TabIndex = 60
@@ -159,7 +110,7 @@ Partial Class frmConfigDatabase
         Me.txtActualConnection.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.txtActualConnection.BackColor = System.Drawing.Color.WhiteSmoke
-        Me.txtActualConnection.Location = New System.Drawing.Point(12, 155)
+        Me.txtActualConnection.Location = New System.Drawing.Point(12, 128)
         Me.txtActualConnection.Name = "txtActualConnection"
         Me.txtActualConnection.ReadOnly = True
         Me.txtActualConnection.Size = New System.Drawing.Size(457, 20)
@@ -168,7 +119,7 @@ Partial Class frmConfigDatabase
         'txtServer
         '
         Me.txtServer.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtServer.Location = New System.Drawing.Point(12, 58)
+        Me.txtServer.Location = New System.Drawing.Point(12, 31)
         Me.txtServer.Name = "txtServer"
         Me.txtServer.Size = New System.Drawing.Size(288, 20)
         Me.txtServer.TabIndex = 53
@@ -176,7 +127,7 @@ Partial Class frmConfigDatabase
         'txtUser
         '
         Me.txtUser.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtUser.Location = New System.Drawing.Point(306, 58)
+        Me.txtUser.Location = New System.Drawing.Point(306, 31)
         Me.txtUser.Name = "txtUser"
         Me.txtUser.Size = New System.Drawing.Size(118, 20)
         Me.txtUser.TabIndex = 54
@@ -184,7 +135,7 @@ Partial Class frmConfigDatabase
         'txtPasswort
         '
         Me.txtPasswort.ForeColor = System.Drawing.SystemColors.WindowText
-        Me.txtPasswort.Location = New System.Drawing.Point(430, 58)
+        Me.txtPasswort.Location = New System.Drawing.Point(430, 31)
         Me.txtPasswort.Name = "txtPasswort"
         Me.txtPasswort.Size = New System.Drawing.Size(64, 20)
         Me.txtPasswort.TabIndex = 55
@@ -194,7 +145,7 @@ Partial Class frmConfigDatabase
         '
         Me.BtnConnect.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.BtnConnect.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.BtnConnect.Location = New System.Drawing.Point(306, 102)
+        Me.BtnConnect.Location = New System.Drawing.Point(306, 75)
         Me.BtnConnect.Name = "BtnConnect"
         Me.BtnConnect.Size = New System.Drawing.Size(253, 25)
         Me.BtnConnect.TabIndex = 57
@@ -202,30 +153,11 @@ Partial Class frmConfigDatabase
         Me.BtnConnect.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.BtnConnect.UseVisualStyleBackColor = True
         '
-        'btndeleteProxy
-        '
-        Me.btndeleteProxy.Image = CType(resources.GetObject("btndeleteProxy.Image"), System.Drawing.Image)
-        Me.btndeleteProxy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btndeleteProxy.ImeMode = System.Windows.Forms.ImeMode.NoControl
-        Me.btndeleteProxy.Location = New System.Drawing.Point(562, 153)
-        Me.btndeleteProxy.Name = "btndeleteProxy"
-        Me.btndeleteProxy.Size = New System.Drawing.Size(97, 23)
-        Me.btndeleteProxy.TabIndex = 67
-        Me.btndeleteProxy.Text = "Lösche Proxy"
-        Me.btndeleteProxy.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btndeleteProxy.UseVisualStyleBackColor = True
-        Me.btndeleteProxy.Visible = False
-        '
         'frmConfigDatabase
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(710, 235)
-        Me.Controls.Add(Me.lblLinkedServer)
-        Me.Controls.Add(Me.txtLinkedServer)
-        Me.Controls.Add(Me.btndeleteProxy)
-        Me.Controls.Add(Me.rbConn_Proxy)
-        Me.Controls.Add(Me.rbConnDefault)
+        Me.ClientSize = New System.Drawing.Size(710, 205)
         Me.Controls.Add(Me.chkbxUserAut)
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.cmbDatenbank)
@@ -239,17 +171,11 @@ Partial Class frmConfigDatabase
         Me.Controls.Add(Me.txtPasswort)
         Me.Controls.Add(Me.BtnConnect)
         Me.Name = "frmConfigDatabase"
-        Me.Text = "ConfigDatabase"
+        Me.Text = "Datenbank Verbindung"
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
-
-    Friend WithEvents lblLinkedServer As Label
-    Friend WithEvents txtLinkedServer As TextBox
-    Friend WithEvents btndeleteProxy As Button
-    Friend WithEvents rbConn_Proxy As RadioButton
-    Friend WithEvents rbConnDefault As RadioButton
     Friend WithEvents chkbxUserAut As CheckBox
     Friend WithEvents Label5 As Label
     Friend WithEvents cmbDatenbank As ComboBox
diff --git a/DDUserManager/DDUserManager/frmConfigDatabase.resx b/DDUserManager/DDUserManager/frmConfigDatabase.resx
index 4cc4549..1af7de1 100644
--- a/DDUserManager/DDUserManager/frmConfigDatabase.resx
+++ b/DDUserManager/DDUserManager/frmConfigDatabase.resx
@@ -117,21 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btndeleteProxy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6
-        JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAACXBIWXMAAAsTAAALEwEAmpwYAAACLUlE
-        QVQ4T52TvY/ScBjHuVIRKHA9JAgnL+VoC7TX0kLLS6EvFBTa0uj5J7gYF+PsfpOTMrg4ORgHY+LCYJwc
-        TYyJiYuDLu7GxHgxd/Hnr5fA8TZcrsmnzfN9nufTNPnVBwDw2ZYljGzr3ciyTNu2EC87L75eb+DvD67f
-        hU9g9vt/HNs5cMaOf9Owohro7YNbe8PhjfuzzBOgkDuabk6bbRXoxuBkNLIeus6yhKyIwY5umo5tHxmG
-        +Wwu8G5QkIa0jN5gqnR1oOkGuOk6b1x3jHl9uaWGhpb1UtXNY1luPmJ4KbIkmAElAcgD3egfa5oJxq77
-        oq3ovKJoE7XbBbwoTWhG2F7cWRJ4dFR1S9fNCvykT41mB9TqjSOxXvtJM9zrYokLrc4vFYtUBcngq9Lf
-        tqICvlr7RhQr8U1za4FHXZIIurT/mePFf1AEJLkFGJb7uml2LRBrcp4us1+g4KRcYV8lkmkplyenglgH
-        VIm9tzq/VJRZLpUlih9yBQrAt79Pp3bjkVgM244nsPwe/VQQ6r8pRsgu7pwtC61grkA/T10r/NrnxB8s
-        V2VmvQiOB0MhLMZVxY/pDPEkU6DnZ2Qu2M0STjJFAIpmAUmXD0NY9PQMzEBRPwJzkiSp71F8J1/ipNMj
-        f9rE8XggkUgexq9cBXmi+DYYjtCRGL72T+D4jr/RaE+waFgu8c0zgUcmT9UuBS4/9m0hmh9Fo7N8FXih
-        CIKE5/Vi8yJsDM8P8P0HLGwR4Wl3ICYAAAAASUVORK5CYII=
-</value>
-  </data>
 </root>
\ No newline at end of file
diff --git a/DDUserManager/DDUserManager/frmConfigDatabase.vb b/DDUserManager/DDUserManager/frmConfigDatabase.vb
index 308f6ed..68caf65 100644
--- a/DDUserManager/DDUserManager/frmConfigDatabase.vb
+++ b/DDUserManager/DDUserManager/frmConfigDatabase.vb
@@ -82,7 +82,6 @@ Public Class frmConfigDatabase
                 con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD ADDI-Client"
             End If
 
-
             Dim connection As New SqlClient.SqlConnection(con) 'csb.ConnectionString)
             'während Verbindungsaufbau Sanduhr-Mauszeiger
             Cursor = Cursors.WaitCursor
@@ -91,15 +90,12 @@ Public Class frmConfigDatabase
             'DialogResult = Windows.Forms.DialogResult.OK
             Dim result As MsgBoxResult
             Dim msg = "Die Verbindung wurde erfolgreich aufgebaut!" & vbNewLine & "Möchten Sie diese Verbindung nun in der Anwendung speichern?"
-            result = MessageBox.Show(msg, "Database-Connection", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            result = MessageBox.Show(msg, "Datenbank-Verbindung", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 ConnectionChanged = True
                 'Set the construction string
-                If rbConnDefault.Checked Then
-                    MyConnectionString = con
-                    'csb.ConnectionString
-                    clsDatabase.Init(MyConnectionString)
-                End If
+                MyConnectionString = con
+                clsDatabase.Init(MyConnectionString)
                 My.Settings.Save()
 
                 If chkbxUserAut.Checked = False Then
@@ -108,11 +104,9 @@ Public Class frmConfigDatabase
                     Dim pw As String = cipherText
                     con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";"
                 End If
-                If rbConnDefault.Checked Then
-                    SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
-                Else
-                    SaveMySettingsValue("MyProxyConnectionString", con, "ConfigMain")
-                End If
+
+                SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
+
                 Dim csb As New SqlClient.SqlConnectionStringBuilder
                 csb.ConnectionString = MyConnectionString
                 Dim constr = connection.ConnectionString
@@ -128,6 +122,10 @@ Public Class frmConfigDatabase
     End Sub
 
     Private Sub cmbDatenbank_MouseClick(sender As Object, e As MouseEventArgs) Handles cmbDatenbank.MouseClick
-        Load_Databases()
+        If txtServer.Text = String.Empty Or txtUser.Text = String.Empty Or txtPasswort.Text = String.Empty Then
+            MsgBox("Bitte füllen Sie die Felder 'Server-Name', 'Benutzername' und 'Passwort' zuerst aus!", MsgBoxStyle.Exclamation, "Datenbank-Verbindung")
+        Else
+            Load_Databases()
+        End If
     End Sub
 End Class
\ No newline at end of file
diff --git a/DDUserManager/DDUserManager/frmMain.Designer.vb b/DDUserManager/DDUserManager/frmMain.Designer.vb
index 6925b39..57b1a17 100644
--- a/DDUserManager/DDUserManager/frmMain.Designer.vb
+++ b/DDUserManager/DDUserManager/frmMain.Designer.vb
@@ -319,6 +319,7 @@ Partial Class frmMain
         Me.PRODUCT_VERSIONTextBox = New System.Windows.Forms.TextBox()
         Me.tabPageRights = New DevExpress.XtraTab.XtraTabPage()
         Me.tabPageSettings = New DevExpress.XtraTab.XtraTabPage()
+        Me.btnConfigConnections = New System.Windows.Forms.Button()
         Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBDD_USERTableAdapter = New DDUserManager.UserDataSetTableAdapters.TBDD_USERTableAdapter()
         Me.TableAdapterManager = New DDUserManager.UserDataSetTableAdapters.TableAdapterManager()
@@ -492,6 +493,7 @@ Partial Class frmMain
         CType(Me.GridView5, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_MODULESBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TBDD_MODULESBindingNavigator.SuspendLayout()
+        Me.tabPageSettings.SuspendLayout()
         CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_CLIENT_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -3414,12 +3416,23 @@ Partial Class frmMain
         '
         'tabPageSettings
         '
+        Me.tabPageSettings.Controls.Add(Me.btnConfigConnections)
         Me.tabPageSettings.Image = Global.DDUserManager.My.Resources.Resources.cog
         Me.tabPageSettings.Name = "tabPageSettings"
-        Me.tabPageSettings.PageEnabled = False
         Me.tabPageSettings.Size = New System.Drawing.Size(1193, 784)
         Me.tabPageSettings.Text = "Einstellungen"
         '
+        'btnConfigConnections
+        '
+        Me.btnConfigConnections.Image = Global.DDUserManager.My.Resources.Resources.database_connect
+        Me.btnConfigConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnConfigConnections.Location = New System.Drawing.Point(11, 17)
+        Me.btnConfigConnections.Name = "btnConfigConnections"
+        Me.btnConfigConnections.Size = New System.Drawing.Size(167, 47)
+        Me.btnConfigConnections.TabIndex = 0
+        Me.btnConfigConnections.Text = "Datenbankverbindung konfigurieren"
+        Me.btnConfigConnections.UseVisualStyleBackColor = True
+        '
         'TBDD_GROUPS_USERBindingSource
         '
         Me.TBDD_GROUPS_USERBindingSource.DataMember = "FK_TBDD_GROUPS_USER_USER_ID"
@@ -3670,6 +3683,7 @@ Partial Class frmMain
         CType(Me.TBDD_MODULESBindingNavigator, System.ComponentModel.ISupportInitialize).EndInit()
         Me.TBDD_MODULESBindingNavigator.ResumeLayout(False)
         Me.TBDD_MODULESBindingNavigator.PerformLayout()
+        Me.tabPageSettings.ResumeLayout(False)
         CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_CLIENT_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_USER_MODULESBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -3961,4 +3975,5 @@ Partial Class frmMain
     Friend WithEvents TableAdapterManager1 As DS_ChangeSTableAdapters.TableAdapterManager
     Friend WithEvents TBDD_GROUPS_USERTableAdapter As UserDataSetTableAdapters.TBDD_GROUPS_USERTableAdapter
     Friend WithEvents LANGUAGEComboBox As ComboBox
+    Friend WithEvents btnConfigConnections As Button
 End Class
diff --git a/DDUserManager/DDUserManager/frmMain.vb b/DDUserManager/DDUserManager/frmMain.vb
index 0d8accb..6770c8b 100644
--- a/DDUserManager/DDUserManager/frmMain.vb
+++ b/DDUserManager/DDUserManager/frmMain.vb
@@ -1004,4 +1004,8 @@ Public Class frmMain
         'UserDataSet.TBDD_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
         DS_ChangeS.TBDD_GROUPS.ADDED_WHOColumn.DefaultValue = Environment.UserName
     End Sub
+
+    Private Sub btnConfigConnections_Click(sender As Object, e As EventArgs) Handles btnConfigConnections.Click
+        frmConfigDatabase.ShowDialog()
+    End Sub
 End Class