diff --git a/mozilla/cck/ib/comp.cpp b/mozilla/cck/ib/comp.cpp
index 9d5379fd027..01d878a886f 100644
--- a/mozilla/cck/ib/comp.cpp
+++ b/mozilla/cck/ib/comp.cpp
@@ -60,6 +60,9 @@ int BuildComponentList(COMPONENT *comps, int *compNum, CString iniSrcPath,
 		GetPrivateProfileString(component, "Attributes", "", 
 			attr, MAX_SIZE, iniSrcPath);
 
+		if (strcmp(component, "Component AOD") == 0)
+			strcpy(attr, "SELECTED");
+
 		comps[*compNum].archive  = CString(archive);
 		comps[*compNum].compname = component;
 		comps[*compNum].name 	 = CString(name);
diff --git a/mozilla/cck/ib/ib.cpp b/mozilla/cck/ib/ib.cpp
index 1e7b7a297ed..7e04b6670f4 100644
--- a/mozilla/cck/ib/ib.cpp
+++ b/mozilla/cck/ib/ib.cpp
@@ -966,13 +966,17 @@ void invisible()
 				WritePrivateProfileString(Components[i].compname, "Attributes",
 				"UNSELECTED|ADDITIONAL|FORCE_UPGRADE", iniDstPath);
 			else if (!(Components[i].disabled) && !(Components[i].additional) &&
-				!(Components[i].invisible))
+				Components[i].forceupgrade && !(Components[i].invisible))
 				WritePrivateProfileString(Components[i].compname, "Attributes",
 				"SELECTED|FORCE_UPGRADE", iniDstPath);
 			else if (Components[i].additional && Components[i].launchapp && 
 				Components[i].uncompress && !(Components[i].invisible))
 				WritePrivateProfileString(Components[i].compname, "Attributes",
 				"SELECTED|UNCOMPRESS|LAUNCHAPP|ADDITIONAL", iniDstPath);
+			 else if (!(Components[i].additional) && 
+				 !(Components[i].forceupgrade) && !(Components[i].invisible))
+				 WritePrivateProfileString(Components[i].compname, "Attributes",
+				 "SELECTED|INVISIBLE", iniDstPath);
 			componentOrder++;
 		}
 		else