diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 37ceea35ac0434291e16e0c3006d4a722dbc563a..9753e2efd506a8eff0137c0a766f306962e902ea 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -421,9 +421,7 @@ class OC_App {
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		/*
-		 * FIXME: Add help sidebar back once documentation is properly branded.
-		 if (OC_Util::getEditionString() === '' &&
+		if (OC_Util::getEditionString() === '' &&
 			\OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
 		) {
 			$settings = array(
@@ -435,7 +433,7 @@ class OC_App {
 					"icon" => $urlGenerator->imagePath("settings", "help.svg")
 				)
 			);
-		}*/
+		}
 
 		// if the user is logged-in
 		if (OC_User::isLoggedIn()) {
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 79584aba84d114236c578ac7be581c0dc7e78771..11726d60387f408151e8d746cc343f8fbc08d3a5 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -16,19 +16,19 @@
 	<?php } ?>
 
 		<li>
-			<a href="https://owncloud.org/support" target="_blank" rel="noreferrer">
+			<a href="https://docs.nextcloud.org" target="_blank" rel="noreferrer">
 				<?php p($l->t('Online documentation')); ?> ↗
 			</a>
 		</li>
 		<li>
-			<a href="https://forum.owncloud.org" target="_blank" rel="noreferrer">
+			<a href="https://help.nextcloud.com" target="_blank" rel="noreferrer">
 				<?php p($l->t('Forum')); ?> ↗
 			</a>
 		</li>
 
 	<?php if($_['admin']) { ?>
 		<li>
-			<a href="https://github.com/owncloud/core/blob/master/CONTRIBUTING.md"
+			<a href="https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md"
 				target="_blank" rel="noreferrer">
 				<?php p($l->t('Issue tracker')); ?> ↗
 			</a>
@@ -36,7 +36,7 @@
 	<?php } ?>
 
 	<li>
-		<a href="https://owncloud.com/subscriptions/" target="_blank" rel="noreferrer">
+		<a href="https://nextcloud.com/enterprise/" target="_blank" rel="noreferrer">
 			<?php p($l->t('Commercial support')); ?> ↗
 		</a>
 	</li>