diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 58c8c2f95f06fc2eb99626be56c58dd04b5f364a..e45e14379351c707706e7d3bb0ade811da1c2494 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -73,23 +73,20 @@ namespace dbaui
     {
         if (&rRadioButton == &*m_pSocketRadio || &rRadioButton == &*m_pNamedPipeRadio)
             m_aControlModificationLink.Call(&rRadioButton);
-        bool bSelected = rRadioButton.IsChecked();
+        m_pHostNameLabel->Enable(m_pHostPortRadio->IsChecked());
+        m_pHostName->Enable(m_pHostPortRadio->IsChecked());
+        m_pPortLabel->Enable(m_pHostPortRadio->IsChecked());
+        m_pPort->Enable(m_pHostPortRadio->IsChecked());
+        m_pDefaultPort->Enable(m_pHostPortRadio->IsChecked());
+        m_pSocket->Enable(m_pSocketRadio->IsChecked());
+        m_pNamedPipe->Enable(m_pNamedPipeRadio->IsChecked());
         if (&rRadioButton == &*m_pHostPortRadio)
         {
-            m_pHostNameLabel->Enable(bSelected);
-            m_pHostName->Enable(bSelected);
-            m_pPortLabel->Enable(bSelected);
-            m_pPort->Enable(bSelected);
-            m_pDefaultPort->Enable(bSelected);
-            if (bSelected)
+            if (rRadioButton.IsChecked())
                 m_pHostName->SetText(m_sHostNameUserText);
             else
                 m_pHostName->SetText("localhost");
         }
-        else if (&rRadioButton == &*m_pSocketRadio)
-            m_pSocket->Enable(bSelected);
-        else if (&rRadioButton == &*m_pNamedPipeRadio)
-            m_pNamedPipe->Enable(bSelected);
     }
 
     IMPL_LINK(MySQLNativeSettings, EditModifyHdl, Edit&, rEdit, void)
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 8f3fb2e79943e232b240fcfcc53587fb7d944f27..4ac9a54ba2b7ebd84cd7e64baa62c0a23e277cad 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -574,6 +574,15 @@ namespace dbaui
             m_pFT_DocListLabel->Enable( false );
             m_pLB_DocumentList->Enable( false );
         }
+        else
+        {
+            m_pEmbeddedDBType->Enable( false );
+            m_pFT_EmbeddedDBLabel->Enable( false );
+            m_pDatasourceType->Enable( false );
+            m_pPB_OpenDatabase->Enable( false );
+            m_pFT_DocListLabel->Enable( false );
+            m_pLB_DocumentList->Enable( false );
+        }
 
         m_pLB_DocumentList->SetDropDownLineCount( 20 );
         if ( m_pLB_DocumentList->GetEntryCount() )
@@ -671,7 +680,7 @@ namespace dbaui
         }
     }
 
-    IMPL_LINK( OGeneralPageWizard, OnSetupModeSelected, Button*, pButton, void )
+    IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, Button*, void )
     {
         m_aCreationModeHandler.Call( *this );
         OnDatasourceTypeSelected(*m_pDatasourceType);
@@ -680,14 +689,12 @@ namespace dbaui
         getFlags( GetItemSet(), bValid, bReadonly );
         if ( bValid && !bReadonly )
         {
-            if (pButton == m_pRB_ConnectDatabase.get())
-                m_pDatasourceType->Enable(m_pRB_ConnectDatabase->IsChecked());
-            else if (pButton == m_pRB_OpenExistingDatabase.get())
-            {
-                m_pPB_OpenDatabase->Enable(m_pRB_OpenExistingDatabase->IsChecked());
-                m_pFT_DocListLabel->Enable(m_pRB_OpenExistingDatabase->IsChecked());
-                m_pLB_DocumentList->Enable(m_pRB_OpenExistingDatabase->IsChecked());
-            }
+            m_pEmbeddedDBType->Enable(m_pRB_CreateDatabase->IsChecked());
+            m_pFT_EmbeddedDBLabel->Enable(m_pRB_CreateDatabase->IsChecked());
+            m_pDatasourceType->Enable(m_pRB_ConnectDatabase->IsChecked());
+            m_pPB_OpenDatabase->Enable(m_pRB_OpenExistingDatabase->IsChecked());
+            m_pFT_DocListLabel->Enable(m_pRB_OpenExistingDatabase->IsChecked());
+            m_pLB_DocumentList->Enable(m_pRB_OpenExistingDatabase->IsChecked());
         }
     }