diff --git a/mozilla/cck/driver/NewConfigDialog.cpp b/mozilla/cck/driver/NewConfigDialog.cpp
index 836f1bf4e1f..52b4e3391ba 100644
--- a/mozilla/cck/driver/NewConfigDialog.cpp
+++ b/mozilla/cck/driver/NewConfigDialog.cpp
@@ -48,9 +48,25 @@ void CNewConfigDialog::DoDataExchange(CDataExchange* pDX)
 	CDialog::DoDataExchange(pDX);
 	//{{AFX_DATA_MAP(CNewConfigDialog)
 	DDX_Text(pDX, IDC_EDIT1, m_NewConfig_field);
+    DDV_Config(pDX, m_NewConfig_field);
+
 	//}}AFX_DATA_MAP
 }
 
+void CNewConfigDialog::DDV_Config(CDataExchange* pDX, CString value)
+{
+	if(pDX->m_bSaveAndValidate) 
+	{
+		value.TrimRight();
+		if(value.IsEmpty())
+		{
+			CWnd nbox;
+			nbox.MessageBox("Please enter a Configuration Name" ,"Error",MB_ICONEXCLAMATION);
+			pDX->Fail();
+		}
+		newConfigName = value;
+	}
+}
 
 BEGIN_MESSAGE_MAP(CNewConfigDialog, CDialog)
 	//{{AFX_MSG_MAP(CNewConfigDialog)
@@ -63,8 +79,8 @@ END_MESSAGE_MAP()
 void CNewConfigDialog::OnOK() 
 {
 	// TODO: Add extra validation here
-	UpdateData();
-	newConfigName = m_NewConfig_field;
+//	UpdateData();
+//	newConfigName = m_NewConfig_field;
 
 	CDialog::OnOK();
 }
diff --git a/mozilla/cck/driver/NewConfigDialog.h b/mozilla/cck/driver/NewConfigDialog.h
index edc4b45544b..9f1b4f32104 100644
--- a/mozilla/cck/driver/NewConfigDialog.h
+++ b/mozilla/cck/driver/NewConfigDialog.h
@@ -35,6 +35,8 @@ public:
 	//}}AFX_DATA
 
 	CString GetConfigName();
+	void DDV_Config(CDataExchange* pDX, CString value);
+
 // Overrides
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CNewConfigDialog)