diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java
index ba31af9b891..21de7f36132 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/CMainWizardPage.java
@@ -325,7 +325,7 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes
     		setMessage(null);
 
             String projectFieldContents = getProjectNameFieldValue();
-	        if (projectFieldContents.equals("")) { //$NON-NLS-1$
+	        if (projectFieldContents.length() == 0) {
 	            setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectNameEmpty);
 	            return false;
 	        }
@@ -339,8 +339,16 @@ import org.eclipse.ui.internal.ide.dialogs.ProjectContentsLocationArea.IErrorMes
 
 	        IProject handle = getProjectHandle();
 	        if (handle.exists()) {
-	            setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectExistsMessage);
-	            return false;
+	        	boolean bad = true;
+	        	if (getWizard() instanceof NewModelProjectWizard) {
+	        		NewModelProjectWizard w = (NewModelProjectWizard)getWizard();
+	        		if (w.lastProjectName != null && w.lastProjectName.equals(getProjectName()))
+	        			bad = false;
+	        	}
+	        	if (bad) {
+	        		setErrorMessage(IDEWorkbenchMessages.WizardNewProjectCreationPage_projectExistsMessage);
+	        		return false;
+	        	}
 	        }
 	        
 	        if (!locationArea.isDefault()) {
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java
index f22179a30f1..534015e2f09 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewModelProjectWizard.java
@@ -60,7 +60,7 @@ public abstract class NewModelProjectWizard extends BasicNewResourceWizard imple
 	private String wz_title;
 	private String wz_desc;
 	
-	private String lastProjectName = null;
+	public String lastProjectName = null;
 	private ICWizardHandler savedHandler = null;
 	private IToolChain[] savedToolChains = null;
 	private boolean savedDefaults = false;
@@ -128,7 +128,7 @@ public abstract class NewModelProjectWizard extends BasicNewResourceWizard imple
 			return true;
 		for (int i=0; i<savedToolChains.length; i++) {
 			boolean found = false;
-			for (int j=0; i<tcs.length; j++) {
+			for (int j=0; j<tcs.length; j++) {
 				if (savedToolChains[i] == tcs[j]) {
 					found = true; break;
 				}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
index d91e5069e77..538cb3c81a6 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/messages.properties
@@ -11,7 +11,7 @@ CConfigWizardPage.8=Deselect all
 CConfigWizardPage.9=Edit properties after project creation
 CConfigWizardPage.10=At least one configuration should be available. Project cannot be created.
 CConfigWizardPage.11=At least one configuration should be selected. Please check needed configurations.
-CConfigWizardPage.12=Additional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. 
+CConfigWizardPage.12=Use "Advanced settings" button to edit project's properties.\n\nAdditional configurations can be added after project creation.\nUse "Manage configurations" buttons either on toolbar or on property pages. 
 CConfigWizardPage.13=Advanced settings...
 CMainWizardPage.0=Project types:
 CMainWizardPage.1=Show project types and toolchains only if they are supported on the platform