diff --git a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
index aaee956..726c618 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb/ejbcreation/org/eclipse/jst/j2ee/internal/ejb/project/operations/EjbFacetInstallDataModelProvider.java
@@ -119,6 +119,9 @@
     		} else {
     	    	model.notifyPropertyChange(GENERATE_DD, IDataModel.DEFAULT_CHG);
     		}
+		} else if (propertyName.equals(CLIENT_NAME)) {
+			String clientProjectURI = model.getStringProperty(CLIENT_NAME).replace(' ', '_');
+			model.setStringProperty(CLIENT_URI, clientProjectURI + IJ2EEModuleConstants.JAR_EXT); 
 	    } else if (propertyName.equals(FACET_PROJECT_NAME)) {
 	    	model.setStringProperty(CLIENT_NAME, (String) model.getDefaultProperty(CLIENT_NAME));
 	    	model.setStringProperty(CLIENT_URI, (String) model.getDefaultProperty(CLIENT_URI));