4 files changed, 16 insertions, 7 deletions
diff --git a/java/src/IceGrid/TreeNode/Application.java b/java/src/IceGrid/TreeNode/Application.java
index c00be603606..2ea54440b91 100755
--- a/java/src/IceGrid/TreeNode/Application.java
+++ b/java/src/IceGrid/TreeNode/Application.java
@@ -52,7 +52,6 @@ public class Application extends EditableParent
 
 	actions[COPY] = true;
 	actions[DELETE] = true;
-	actions[SUBSTITUTE_VARS] = true;
 
 	Object descriptor =  _model.getClipboard();
 	if(descriptor != null)
@@ -64,6 +63,11 @@ public class Application extends EditableParent
 	    actions[APPLICATION_INSTALL_DISTRIBUTION] = 
 		!_descriptor.distrib.icepatch.equals("");
 	}
+
+	if(!_ephemeral)
+	{
+	    actions[SUBSTITUTE_VARS] = true;
+	}
 	
 	actions[NEW_NODE] = (_nodes != null);
 	actions[NEW_REPLICA_GROUP] = (_replicaGroups != null);
diff --git a/java/src/IceGrid/TreeNode/Node.java b/java/src/IceGrid/TreeNode/Node.java
index 1ab531cccbb..664dac74cd9 100755
--- a/java/src/IceGrid/TreeNode/Node.java
+++ b/java/src/IceGrid/TreeNode/Node.java
@@ -63,7 +63,6 @@ class Node extends EditableParent
 
 	actions[COPY] = true;
 	actions[DELETE] = true;
-	actions[SUBSTITUTE_VARS] = true;
 
 	Object descriptor =  _model.getClipboard();
 	if(descriptor != null)
@@ -72,10 +71,15 @@ class Node extends EditableParent
 		descriptor instanceof ServerInstanceDescriptor ||
 		descriptor instanceof ServerDescriptor;
 	}
-	actions[NEW_SERVER] = true;
-	actions[NEW_SERVER_ICEBOX] = true;
-	actions[NEW_SERVER_FROM_TEMPLATE] = true;
-	actions[SHUTDOWN_NODE] = _up;
+
+	if(!_ephemeral)
+	{
+	    actions[SUBSTITUTE_VARS] = true;
+	    actions[NEW_SERVER] = true;
+	    actions[NEW_SERVER_ICEBOX] = true;
+	    actions[NEW_SERVER_FROM_TEMPLATE] = true;
+	    actions[SHUTDOWN_NODE] = _up;
+	}
 	return actions;
     }
 
diff --git a/java/src/IceGrid/TreeNode/Server.java b/java/src/IceGrid/TreeNode/Server.java
index a5f38801e2d..2c2774ea48d 100755
--- a/java/src/IceGrid/TreeNode/Server.java
+++ b/java/src/IceGrid/TreeNode/Server.java
@@ -162,7 +162,7 @@ class Server extends EditableParent
 	}
 
 	actions[DELETE] = true;
-	actions[SUBSTITUTE_VARS] = true;
+	actions[SUBSTITUTE_VARS] = !_ephemeral;
 	
 	if(_instanceDescriptor == null)
 	{
diff --git a/java/src/IceGrid/TreeNode/ServerTemplate.java b/java/src/IceGrid/TreeNode/ServerTemplate.java
index 4b85ba0714c..f2b547491ad 100755
--- a/java/src/IceGrid/TreeNode/ServerTemplate.java
+++ b/java/src/IceGrid/TreeNode/ServerTemplate.java
@@ -65,6 +65,7 @@ class ServerTemplate extends EditableParent
 	{
 	    actions[PASTE] = true;
 	}
+
 	actions[DELETE] = true;
 
 	actions[NEW_ADAPTER] = (_adapters != null && _services == null);