diff -r 1013fc438627 cloud.oracle/src/org/netbeans/modules/cloud/oracle/OracleInstance.java
--- a/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OracleInstance.java	Tue Jun 26 09:38:04 2012 +0200
+++ b/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OracleInstance.java	Tue Jun 26 10:53:08 2012 +0200
@@ -250,10 +250,6 @@
         synchronized (this) {
             this.password = password;
             this.passwordLoaded = true;
-            if (j2eeInstance != null) {
-                j2eeInstance.getInstanceProperties().setProperty(
-                                    InstanceProperties.PASSWORD_ATTR, password);
-            }
         }
         resetCache();
     }
@@ -262,10 +258,6 @@
         synchronized (this) {
             this.user = user;
             this.userLoaded = true;
-            if (j2eeInstance != null) {
-                j2eeInstance.getInstanceProperties().setProperty(
-                                    InstanceProperties.USERNAME_ATTR, user);
-            }
         }
         resetCache();
     }
diff -r 1013fc438627 cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleDeploymentFactory.java
--- a/cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleDeploymentFactory.java	Tue Jun 26 09:38:04 2012 +0200
+++ b/cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleDeploymentFactory.java	Tue Jun 26 10:53:08 2012 +0200
@@ -50,6 +50,7 @@
 import org.netbeans.libs.oracle.cloud.sdkwrapper.api.ApplicationManager;
 import org.netbeans.libs.oracle.cloud.sdkwrapper.exception.SDKException;
 import org.netbeans.modules.cloud.oracle.OracleInstance;
+import org.netbeans.modules.cloud.oracle.OracleInstanceManager;
 import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
 import org.openide.util.NbBundle;
 
@@ -76,17 +77,19 @@
     @Override
     public DeploymentManager getDeploymentManager(String uri, String username,
             String password) throws DeploymentManagerCreationException {
+        OracleInstance instance = findInstance(uri);
         InstanceProperties props = InstanceProperties.getInstanceProperties(uri);
-        ApplicationManager am;
-        try {
-            am = OracleInstance.createApplicationManager(
-                    props.getProperty(IP_ADMIN_URL), 
-                    username,
-                    password,
-                    CloudSDKHelper.getSDKFolder());
-        } catch (SDKException e) {
-            LOG.log(Level.FINE, "cannot access SDK", e);
-            am = null;
+        ApplicationManager am = null;
+        if (instance != null) {
+            try {
+                am = OracleInstance.createApplicationManager(
+                        props.getProperty(IP_ADMIN_URL), 
+                        instance.getUser(),
+                        instance.getPassword(),
+                        CloudSDKHelper.getSDKFolder());
+            } catch (SDKException e) {
+                LOG.log(Level.FINE, "cannot access SDK", e);
+            }
         }
 
         return new OracleDeploymentManager(
@@ -118,4 +121,13 @@
         return "1.0"; // NOI18N
     }
     
+    private OracleInstance findInstance(String id) {
+        for (OracleInstance ai : OracleInstanceManager.getDefault().getInstances()) {
+            if (id.equals(OracleJ2EEInstance.createURL(ai.getName(), ai.getIdentityDomain(), ai.getJavaServiceName()))) {
+                return ai;
+            }
+        }
+        return null;
+    }
+    
 }
diff -r 1013fc438627 cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleJ2EEServerInstanceProvider.java
--- a/cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleJ2EEServerInstanceProvider.java	Tue Jun 26 09:38:04 2012 +0200
+++ b/cloud.oracle/src/org/netbeans/modules/cloud/oracle/serverplugin/OracleJ2EEServerInstanceProvider.java	Tue Jun 26 10:53:08 2012 +0200
@@ -117,7 +117,7 @@
                     props.put(OracleDeploymentFactory.IP_ADMIN_URL, ai.getAdminURL());
                     props.put(OracleDeploymentFactory.IP_PREMISE_SERVICE_INSTANCE_ID, ai.getOnPremiseServerInstanceId());
                     ip = InstanceProperties.createInstancePropertiesNonPersistent(inst.getId(), 
-                            ai.getUser(), ai.getPassword(), inst.getDisplayName(), props);
+                            null, null, inst.getDisplayName(), props);
                 } catch (InstanceCreationException ex) {
                     Exceptions.printStackTrace(ex);
                 }