diff --git a/cck/cckwiz/iniFiles/Mail_page.ini b/cck/cckwiz/iniFiles/Mail_page.ini
index 1c495ab0885..a7edc4d9f92 100644
--- a/cck/cckwiz/iniFiles/Mail_page.ini
+++ b/cck/cckwiz/iniFiles/Mail_page.ini
@@ -28,7 +28,7 @@ Caption=2nd level node
 Help=Online;%Root%CCKHelp\brandingpage1.html
 
 [Navigation Controls]
-onNext=
+onNext=IsMailfieldempty()
 Help=Branding1_Help.ini
 
 [Image 1666]
diff --git a/cck/cckwiz/iniFiles/News_page.ini b/cck/cckwiz/iniFiles/News_page.ini
index 46a0004b642..cea22012378 100644
--- a/cck/cckwiz/iniFiles/News_page.ini
+++ b/cck/cckwiz/iniFiles/News_page.ini
@@ -28,7 +28,7 @@ Caption=2nd level node
 Help=Online;%Root%CCKHelp\brandingpage1.html
 
 [Navigation Controls]
-onNext=
+onNext=IsNewsfieldempty()
 Help=Branding1_Help.ini
 
 
diff --git a/cck/driver/interpret.cpp b/cck/driver/interpret.cpp
index 59fb6c6c1ea..f351b6a50c2 100644
--- a/cck/driver/interpret.cpp
+++ b/cck/driver/interpret.cpp
@@ -603,7 +603,58 @@ BOOL CInterpret::interpret(CString cmds, WIDGET *curWidget)
 				{
 					if (!IterateListBox(parms))
 						return FALSE;
+				}
+				else if(strcmp(pcmd, "IsMailfieldempty") ==0)
+				{
+					CString ispDomainName = GetGlobal("DomainName");
+					CString ispPrettyName = GetGlobal("PrettyName");
+					CString ispLongName = GetGlobal("LongName");
+					CString ispInServer = GetGlobal("IncomingServer");
+					CString ispOutServer = GetGlobal("OutgoingServer");
+					CString ispPortNumber = GetGlobal("PortNumber");
+					if ((ispDomainName.IsEmpty()) || 
+						(ispPrettyName.IsEmpty()) || 
+						(ispLongName.IsEmpty()) || 
+						(ispInServer.IsEmpty())	|| 
+						(ispOutServer.IsEmpty()) || 
+						(ispPortNumber.IsEmpty()))
+					{
+						if (!((ispDomainName.IsEmpty()) && 
+							(ispPrettyName.IsEmpty()) && 
+							(ispLongName.IsEmpty()) && 
+							(ispInServer.IsEmpty())	&& 
+							(ispOutServer.IsEmpty()) && 
+							(ispPortNumber.IsEmpty())))
+						{
+							AfxMessageBox("All fields must be filled to create a customized mail account", MB_OK);
+							return FALSE;
+						}
+					}
 				}
+				else if(strcmp(pcmd, "IsNewsfieldempty") ==0)
+				{
+					CString newsDomainName = GetGlobal("nDomainName");
+					CString newsPrettyName = GetGlobal("nPrettyName");
+					CString newsLongName = GetGlobal("nLongName");
+					CString newsServer = GetGlobal("nServer");
+					CString newsPortNumber = GetGlobal("nPortNumber");
+					if ((newsDomainName.IsEmpty()) || 
+						(newsPrettyName.IsEmpty()) || 
+						(newsLongName.IsEmpty()) || 
+						(newsServer.IsEmpty()) || 
+						(newsPortNumber.IsEmpty()))
+					{
+						if (!((newsDomainName.IsEmpty()) && 
+							(newsPrettyName.IsEmpty()) && 
+							(newsLongName.IsEmpty()) && 
+							(newsServer.IsEmpty())	&& 
+							(newsPortNumber.IsEmpty())))
+						{
+							AfxMessageBox("All fields must be filled to create a customized news account", MB_OK);
+							return FALSE;
+						}
+					}
+				}
 				else if(strcmp(pcmd, "IsNumeric") ==0)
 				{
 					WIDGET *wid;