diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py
index 69838d2e..1e0441d8 100644
--- a/ee/cli/plugins/site.py
+++ b/ee/cli/plugins/site.py
@@ -1266,7 +1266,7 @@ class EESiteUpdateController(CementBaseController):
         data['ee_db_host'] = check_site.db_host
         data['old_pagespeed_status'] = check_site.is_pagespeed
 
-        if not (pargs.letsencrypt or pargs.letsencrypt == "off"):
+        if not pargs.letsencrypt:
             try:
                 pre_run_checks(self)
             except SiteError as e:
diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py
index 9a1b0830..60a3349a 100644
--- a/ee/cli/plugins/stack.py
+++ b/ee/cli/plugins/stack.py
@@ -1668,7 +1668,7 @@ class EEStackController(CementBaseController):
                     Log.info(self, "Mail server is already installed")
 
             if self.app.pargs.pagespeed:
-                if not EEAptGet.is_installed(self, 'nginx-custom'):
+                if not (EEAptGet.is_installed(self, 'nginx-custom') or EEAptGet.is_installed(self, 'nginx-mainline')):
                     self.app.pargs.nginx = True
                 else:
                     Log.info(self, "Nginx already installed")