diff --git a/gradle/changelog/replace_scmmanager_mail_address.yaml b/gradle/changelog/replace_scmmanager_mail_address.yaml
new file mode 100644
index 0000000000..f3ecb0f493
--- /dev/null
+++ b/gradle/changelog/replace_scmmanager_mail_address.yaml
@@ -0,0 +1,2 @@
+- type: changed
+  description: Default host 'scm-manager.org' replaced with 'example.org' in default mail address
diff --git a/scm-it/src/test/java/sonia/scm/it/webapp/UserPermissionITCase.java b/scm-it/src/test/java/sonia/scm/it/webapp/UserPermissionITCase.java
index 288a1b3e2b..b072990278 100644
--- a/scm-it/src/test/java/sonia/scm/it/webapp/UserPermissionITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/webapp/UserPermissionITCase.java
@@ -122,7 +122,7 @@ public class UserPermissionITCase extends AbstractPermissionITCaseBase<User>
   protected User getModifyItem()
   {
     User user = new User("scmadmin", "SCM Administrator",
-                         "scm-admin@scm-manager.org");
+                         "scm@example.com");
 
     user.setPassword("hallo123");
     user.setType("xml");
diff --git a/scm-webapp/src/main/java/sonia/scm/lifecycle/AdminAccountStartupAction.java b/scm-webapp/src/main/java/sonia/scm/lifecycle/AdminAccountStartupAction.java
index 2fc93a04e9..cd029eceb5 100644
--- a/scm-webapp/src/main/java/sonia/scm/lifecycle/AdminAccountStartupAction.java
+++ b/scm-webapp/src/main/java/sonia/scm/lifecycle/AdminAccountStartupAction.java
@@ -85,7 +85,7 @@ public class AdminAccountStartupAction implements InitializationStep {
     if (startupTokenByProperty != null) {
       String adminUserName = System.getProperty(INITIAL_USER_PROPERTY, "scmadmin");
       context.runAsAdmin((PrivilegedStartupAction) () ->
-        createAdminUser(adminUserName, "SCM Administrator", "scm-admin@scm-manager.org", startupTokenByProperty));
+        createAdminUser(adminUserName, "SCM Administrator", "scm@example.com", startupTokenByProperty));
       LOG.info("================={}========================", adminUserName.replaceAll(".", "="));
       LOG.info("==               {}                      ==", adminUserName.replaceAll(".", " "));
       LOG.info("== Created user '{}' with given password ==", adminUserName);