From ce295cee089e185c0d9ecc4d25d16dc313a3bcf6 Mon Sep 17 00:00:00 2001
From: Guus der Kinderen <guus.der.kinderen@gmail.com>
Date: Tue, 12 May 2026 15:00:08 +0200
Subject: [PATCH] OF-3276: Autosetup should not try to modify admin user unless
 instructed

Only try to update the admin user when there are actual autosetup values provided. This prevents warnings being logged when autosetup is using a configuration that does not use the default 'admin' user.
---
 .../org/jivesoftware/openfire/XMPPServer.java | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
index 74296ad481..ba52488d60 100644
--- a/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
+++ b/xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java
@@ -516,19 +516,25 @@ void runAutoSetup() {
             JiveGlobals.setProperty("user.scramHashedPasswordOnly", "true");
         }
 
-        // steps from setup-admin-settings.jsp
-        try {
-            User adminUser = UserManager.getInstance().getUser("admin");
-            adminUser.setPassword(JiveGlobals.getXMLProperty("autosetup.admin.password"));
-            adminUser.setEmail(JiveGlobals.getXMLProperty("autosetup.admin.email"));
-            Date now = new Date();
-            adminUser.setCreationDate(now);
-            adminUser.setModificationDate(now);
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.warn("There was an unexpected error encountered when "
-                + "setting the new admin information. Please check your error "
-                + "logs and try to remedy the problem.");
+        // steps from setup-admin-settings.jsp: change attributes of the default admin user
+        if (JiveGlobals.getXMLProperty("autosetup.admin.password") != null || JiveGlobals.getXMLProperty("autosetup.admin.email") != null) {
+            try {
+                User adminUser = UserManager.getInstance().getUser("admin");
+                if (JiveGlobals.getXMLProperty("autosetup.admin.password") != null) {
+                    adminUser.setPassword(JiveGlobals.getXMLProperty("autosetup.admin.password"));
+                }
+                if (JiveGlobals.getXMLProperty("autosetup.admin.email") != null) {
+                    adminUser.setEmail(JiveGlobals.getXMLProperty("autosetup.admin.email"));
+                }
+                Date now = new Date();
+                adminUser.setCreationDate(now);
+                adminUser.setModificationDate(now);
+            } catch (Exception e) {
+                e.printStackTrace();
+                logger.warn("There was an unexpected error encountered when "
+                    + "setting the new admin information. Please check your error "
+                    + "logs and try to remedy the problem.");
+            }
         }
 
         // Import any provisioned users.