diff --git a/gradle/changelog/fix_index_links_in_repo_init_extension.yaml b/gradle/changelog/fix_index_links_in_repo_init_extension.yaml
new file mode 100644
index 0000000000..eeb701777b
--- /dev/null
+++ b/gradle/changelog/fix_index_links_in_repo_init_extension.yaml
@@ -0,0 +1,2 @@
+- type: fixed
+  description: Index link collection in repository initialize extensions ([#1594](https://github.com/scm-manager/scm-manager/issues/1588) and [#1587](https://github.com/scm-manager/scm-manager/issues/1594))
diff --git a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
index 60cb7b5d05..7a96e2e194 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
@@ -124,10 +124,11 @@ const RepositoryForm: FC<Props> = ({
     if (isEditMode()) {
       return null;
     }
+    const indexResourcesWithLinks = { ...indexResources, links: indexResources?._links };
     const extensionProps = {
       repository: repo,
       setCreationContextEntry: setCreationContextEntry,
-      indexResources
+      indexResources: indexResourcesWithLinks
     };
     return (
       <>