29a772
diff -up mozilla-esr17/browser/app/profile/firefox.js.addons mozilla-esr17/browser/app/profile/firefox.js
29a772
--- mozilla-esr17/browser/app/profile/firefox.js.addons	2012-11-29 05:43:51.000000000 +0100
29a772
+++ mozilla-esr17/browser/app/profile/firefox.js	2012-12-21 08:40:51.799335531 +0100
29a772
@@ -61,7 +61,7 @@ pref("extensions.hotfix.certs.1.sha1Fing
29a772
 
29a772
 // Disable add-ons that are not installed by the user in all scopes by default.
29a772
 // See the SCOPE constants in AddonManager.jsm for values to use here.
29a772
-pref("extensions.autoDisableScopes", 15);
29a772
+pref("extensions.autoDisableScopes", 0);
29a772
 
29a772
 // Dictionary download preference
29a772
 pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
29a772
diff -up mozilla-esr17/toolkit/mozapps/extensions/XPIProvider.jsm.addons mozilla-esr17/toolkit/mozapps/extensions/XPIProvider.jsm
29a772
--- mozilla-esr17/toolkit/mozapps/extensions/XPIProvider.jsm.addons	2012-11-29 05:45:08.000000000 +0100
29a772
+++ mozilla-esr17/toolkit/mozapps/extensions/XPIProvider.jsm	2012-12-21 08:40:14.342341623 +0100
29a772
@@ -1630,8 +1630,8 @@ var XPIProvider = {
29a772
       this.showUpgradeUI();
29a772
       flushCaches = true;
29a772
     }
29a772
-    else if (aAppChanged === undefined) {
29a772
-      // For new profiles we will never need to show the add-on selection UI
29a772
+    else {
29a772
+      // For all profiles we will never need to show the add-on selection UI
29a772
       Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
29a772
     }
29a772