diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d7e7fa5d00..a115b9d448 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -15,6 +15,7 @@ Fixes:
 - DietPi-VPN | Resolved an issue where applying a ProtonVPN connection or starting the killswitch could have failed, if the "gettext-base" package was not installed. Many thanks to @Wilford888 for reporting this issue: https://github.com/MichaIng/DietPi/issues/5501
 - DietPi-Software | Spotifyd: Resolved an issue where fresh installs failed because of a missing parent directory. Many thanks to @C0ntroller for reporting this issue: https://github.com/MichaIng/DietPi/issues/5484
 - DietPi-Software | WiringPi: Resolved an issue where the install on Odroids failed as of a change in the build scripts of Hardkernel's fork. Many thanks to @MDAR for reporting this issue: https://github.com/MichaIng/DietPi/issues/5485
+- DietPi-Software | Gitea: Resolved an issue where the service failed to start after a reinstall when Gitea was installed before DietPi v7.9. Many thanks to @twikedk for reporting this issue: https://github.com/MichaIng/DietPi/issues/5516
 
 As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX
 
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 0eb29c7887..2f8bf42fed 100755
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -11252,6 +11252,8 @@ NoNewPrivileges=true
 [Install]
 WantedBy=multi-user.target
 _EOF_
+			# Migrate run user setting: https://github.com/MichaIng/DietPi/issues/5516
+			[[ -f '/mnt/dietpi_userdata/gitea/custom/conf/app.ini' ]] && G_CONFIG_INJECT 'RUN_USER[[:blank:]]' 'RUN_USER = gitea' /mnt/dietpi_userdata/gitea/custom/conf/app.ini
 		fi
 
 		software_id=163 # GMediaRender