diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py
index 88e0138b7..3ce5598a4 100644
--- a/install/installCyberPanel.py
+++ b/install/installCyberPanel.py
@@ -501,15 +501,17 @@ module cyberpanel_ols {
 
             # Enable Auto-SSL in httpd_config.conf
             try:
+                import re
                 conf_path = '/usr/local/lsws/conf/httpd_config.conf'
                 if os.path.exists(conf_path):
                     with open(conf_path, 'r') as f:
                         content = f.read()
                     if 'autoSSL' not in content:
-                        content = content.replace(
-                            'adminEmails               root@localhost',
-                            'adminEmails               root@localhost\nautoSSL                   1\nacmeEmail                 admin@cyberpanel.net',
-                            1
+                        content = re.sub(
+                            r'(adminEmails\s+\S+)',
+                            r'\1\nautoSSL                   1\nacmeEmail                 admin@cyberpanel.net',
+                            content,
+                            count=1
                         )
                         with open(conf_path, 'w') as f:
                             f.write(content)
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 551e74eb6..88b2f5f39 100644
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -4598,13 +4598,15 @@ pm.max_spare_servers = 3
                 # Enable Auto-SSL if not already configured
                 conf_path = '/usr/local/lsws/conf/httpd_config.conf'
                 try:
+                    import re
                     with open(conf_path, 'r') as f:
                         content = f.read()
                     if 'autoSSL' not in content:
-                        content = content.replace(
-                            'adminEmails               root@localhost',
-                            'adminEmails               root@localhost\nautoSSL                   1\nacmeEmail                 admin@cyberpanel.net',
-                            1
+                        content = re.sub(
+                            r'(adminEmails\s+\S+)',
+                            r'\1\nautoSSL                   1\nacmeEmail                 admin@cyberpanel.net',
+                            content,
+                            count=1
                         )
                         with open(conf_path, 'w') as f:
                             f.write(content)