diff --git a/base/src/org/compiere/db/CConnection.java b/base/src/org/compiere/db/CConnection.java
index ff31ea2601..140b3ac0a6 100644
--- a/base/src/org/compiere/db/CConnection.java
+++ b/base/src/org/compiere/db/CConnection.java
@@ -111,7 +111,7 @@ public class CConnection implements Serializable, Cloneable
 			{
 				//hengsin, zero setup for webstart client
 				CConnection cc = null;
-				if (apps_host != null && Adempiere.isWebStartClient())
+				if (apps_host != null && Adempiere.isWebStartClient() && !CConnection.isServerEmbedded())
 				{
 					cc = new CConnection(apps_host);
 					cc.setConnectionProfile(CConnection.PROFILE_LAN);
diff --git a/base/src/org/compiere/db/CConnectionDialog.java b/base/src/org/compiere/db/CConnectionDialog.java
index 7d63538e70..bdad71c11b 100644
--- a/base/src/org/compiere/db/CConnectionDialog.java
+++ b/base/src/org/compiere/db/CConnectionDialog.java
@@ -425,7 +425,7 @@ public class CConnectionDialog extends CDialog implements ActionListener
 	//	bTestApps.setToolTipText(m_cc.getRmiUri());
 
 		//cbOverwrite.setVisible(m_cc.isAppsServerOK(false));
-		boolean rw = !m_cc.isAppsServerOK(false);
+		boolean rw = CConnection.isServerEmbedded() ? true : !m_cc.isAppsServerOK(false);
 		//
 		dbTypeLabel.setReadWrite(rw);
 		dbTypeField.setReadWrite(rw);
diff --git a/client/src/org/compiere/apps/ALogin.java b/client/src/org/compiere/apps/ALogin.java
index de45792390..45df748c14 100644
--- a/client/src/org/compiere/apps/ALogin.java
+++ b/client/src/org/compiere/apps/ALogin.java
@@ -411,7 +411,8 @@ public final class ALogin extends CDialog
 	}   //  processWindowEvent
 
 	private void validateAppServer() {
-		m_cc.testAppsServer();
+		if (!CConnection.isServerEmbedded())
+			m_cc.testAppsServer();
 	}
 	
 	private void connectToDatabase() {