diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json
index 14fb1908d9..e425f54eb9 100644
--- a/scm-ui/ui-webapp/public/locales/de/repos.json
+++ b/scm-ui/ui-webapp/public/locales/de/repos.json
@@ -22,7 +22,10 @@
     "typeHelpText": "Der Typ des Repository (Mercurial, Git oder Subversion).",
     "contactHelpText": "E-Mail Adresse der Person, die für das Repository verantwortlich ist.",
     "descriptionHelpText": "Eine kurze Beschreibung des Repository.",
-    "initializeRepository": "Erstellt einen ersten Branch und committet eine README.md."
+    "initializeRepository": "Erstellt einen ersten Branch und committet eine README.md.",
+    "importUrlHelpText": "Importiert das gesamte Repository inkl. aller Branches und Tags über die Remote URL.",
+    "usernameHelpText": "Benutzername könnte für den Import benötigt werden. Wird ignoriert, falls nicht gesetzt.",
+    "passwordHelpText": "Password könnte für den Import benötigt werden. Wird ignoriert, falls nicht gesetzt."
   },
   "repositoryRoot": {
     "errorTitle": "Fehler",
@@ -46,7 +49,13 @@
   },
   "create": {
     "title": "Repository hinzufügen",
-    "subtitle": "Erstellen eines neuen Repository"
+    "createSubtitle": "Neues Repository erstellen",
+    "importSubtitle": "Bestehendes Repository importieren",
+    "importUrl": "Remote repository url",
+    "username": "Benutzername",
+    "password": "Passwort",
+    "createButton": "Neues Repository erstellen",
+    "importButton": "Repository importieren"
   },
   "branches": {
     "overview": {
@@ -155,7 +164,8 @@
   },
   "repositoryForm": {
     "subtitle": "Repository bearbeiten",
-    "submit": "Speichern",
+    "submitCreate": "Speichern",
+    "submitImport": "Importieren",
     "initializeRepository": "Repository initiieren",
     "dangerZone": "Umbenennen und Löschen"
   },
diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json
index 8341137236..362a5e7241 100644
--- a/scm-ui/ui-webapp/public/locales/en/repos.json
+++ b/scm-ui/ui-webapp/public/locales/en/repos.json
@@ -22,7 +22,10 @@
     "typeHelpText": "The type of the repository (e.g. Mercurial, Git or Subversion).",
     "contactHelpText": "Email address of the person who is responsible for this repository.",
     "descriptionHelpText": "A short description of the repository.",
-    "initializeRepository": "Creates an initial branch and commits a basic README.md."
+    "initializeRepository": "Creates an initial branch and commits a basic README.md.",
+    "importUrlHelpText": "Import the whole repository including all branches and tags via remote url",
+    "usernameHelpText": "Username may be required to import the remote repository. Will be ignored if not provided.",
+    "passwordHelpText": "Password may be required to import the remote repository. Will be ignored if not provided."
   },
   "repositoryRoot": {
     "errorTitle": "Error",
@@ -46,7 +49,13 @@
   },
   "create": {
     "title": "Add Repository",
-    "subtitle": "Create a new repository"
+    "createSubtitle": "Create a new repository",
+    "importSubtitle": "Import existing repository",
+    "importUrl": "Remote repository url",
+    "username": "Username",
+    "password": "Password",
+    "createButton": "Create new repository",
+    "importButton": "Import repository"
   },
   "branches": {
     "overview": {
@@ -155,7 +164,8 @@
   },
   "repositoryForm": {
     "subtitle": "Edit Repository",
-    "submit": "Save",
+    "submitCreate": "Save",
+    "submitImport": "Import",
     "initializeRepository": "Initialize repository",
     "dangerZone": "Rename and delete"
   },
diff --git a/scm-ui/ui-webapp/src/containers/Main.tsx b/scm-ui/ui-webapp/src/containers/Main.tsx
index e0af6ee867..73b5c9370e 100644
--- a/scm-ui/ui-webapp/src/containers/Main.tsx
+++ b/scm-ui/ui-webapp/src/containers/Main.tsx
@@ -78,6 +78,7 @@ class Main extends React.Component<Props> {
             <Redirect exact strict from="/repos" to="/repos/" />
             <ProtectedRoute exact path="/repos/" component={Overview} authenticated={authenticated} />
             <ProtectedRoute exact path="/repos/create" component={Create} authenticated={authenticated} />
+            <ProtectedRoute exact path="/repos/import" component={Create} authenticated={authenticated} />
             <ProtectedRoute exact path="/repos/:namespace" component={Overview} authenticated={authenticated} />
             <ProtectedRoute exact path="/repos/:namespace/:page" component={Overview} authenticated={authenticated} />
             <ProtectedRoute path="/repo/:namespace/:name" component={RepositoryRoot} authenticated={authenticated} />
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 a841715104..1166049614 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryForm.tsx
@@ -21,14 +21,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from "react";
+import React, { FC, useEffect, useState } from "react";
 import styled from "styled-components";
-import { WithTranslation, withTranslation } from "react-i18next";
+import { useTranslation } from "react-i18next";
 import { ExtensionPoint } from "@scm-manager/ui-extensions";
-import { Repository, RepositoryCreation, RepositoryType } from "@scm-manager/ui-types";
-import { Checkbox, InputField, Level, Select, SubmitButton, Subtitle, Textarea } from "@scm-manager/ui-components";
+import { Repository, RepositoryType } from "@scm-manager/ui-types";
+import { Checkbox, InputField, Level, Select, SubmitButton, Textarea } from "@scm-manager/ui-components";
 import * as validator from "./repositoryValidation";
 import { CUSTOM_NAMESPACE_STRATEGY } from "../../modules/repos";
+import { useLocation } from "react-router-dom";
+import RepositoryFormSwitcher from "./RepositoryFormSwitcher";
 
 const CheckboxWrapper = styled.div`
   margin-top: 2em;
@@ -44,8 +46,18 @@ const SpaceBetween = styled.div`
   justify-content: space-between;
 `;
 
-type Props = WithTranslation & {
-  submitForm: (repo: RepositoryCreation, shouldInit: boolean) => void;
+const Column = styled.div`
+  padding: 0 0.75rem;
+`;
+
+const Columns = styled.div`
+  padding: 0.75rem 0 0;
+`;
+
+type Props = {
+  createRepository?: (repo: RepositoryCreation, shouldInit: boolean) => void;
+  modifyRepository?: (repo: RepositoryCreation) => void;
+  importRepository?: (repo: RepositoryCreation) => void;
   repository?: Repository;
   repositoryTypes?: RepositoryType[];
   namespaceStrategy?: string;
@@ -53,141 +65,117 @@ type Props = WithTranslation & {
   indexResources: any;
 };
 
-type State = {
-  repository: RepositoryCreation;
-  initRepository: boolean;
-  namespaceValidationError: boolean;
-  nameValidationError: boolean;
-  contactValidationError: boolean;
+type RepositoryCreation = Repository & {
+  contextEntries: object;
 };
 
-class RepositoryForm extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
+const RepositoryForm: FC<Props> = ({
+  createRepository,
+  modifyRepository,
+  importRepository,
+  repository,
+  repositoryTypes,
+  namespaceStrategy,
+  loading,
+  indexResources
+}) => {
+  const [repo, setRepo] = useState<RepositoryCreation>({
+    name: "",
+    namespace: "",
+    type: "",
+    contact: "",
+    description: "",
+    contextEntries: {},
+    _links: {}
+  });
+  const [initRepository, setInitRepository] = useState(false);
+  const [namespaceValidationError, setNamespaceValidationError] = useState(false);
+  const [nameValidationError, setNameValidationError] = useState(false);
+  const [contactValidationError, setContactValidationError] = useState(false);
+  const [importUrl, setImportUrl] = useState("");
+  const [username, setUsername] = useState("");
+  const [password, setPassword] = useState("");
 
-    this.state = {
-      repository: {
-        name: "",
-        namespace: "",
-        type: "",
-        contact: "",
-        description: "",
-        contextEntries: {},
-        _links: {}
-      },
-      initRepository: false,
-      namespaceValidationError: false,
-      nameValidationError: false,
-      contactValidationError: false
-    };
-  }
+  const location = useLocation();
+  const [t] = useTranslation("repos");
 
-  componentDidMount() {
-    const { repository } = this.props;
+  useEffect(() => {
     if (repository) {
-      this.setState({
-        repository: {
-          ...repository,
-          contextEntries: {}
-        }
-      });
+      setRepo({ ...repository, contextEntries: {} });
     }
-  }
+  }, [repository]);
 
-  isFalsy(value: string) {
-    return !value;
-  }
-
-  isValid = () => {
-    const { namespaceStrategy } = this.props;
-    const { repository } = this.state;
+  const isValid = () => {
     return !(
-      this.state.namespaceValidationError ||
-      this.state.nameValidationError ||
-      this.state.contactValidationError ||
-      this.isFalsy(repository.name) ||
-      (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && this.isFalsy(repository.namespace))
+      namespaceValidationError ||
+      nameValidationError ||
+      contactValidationError ||
+      !repo.name ||
+      (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && !repo.namespace) ||
+      (isImportPage() && !importUrl)
     );
   };
 
-  submit = (event: React.FormEvent<HTMLFormElement>) => {
+  const submit = (event: React.FormEvent<HTMLFormElement>) => {
     event.preventDefault();
-    if (this.isValid()) {
-      this.props.submitForm(this.state.repository, this.state.initRepository);
+    const submitForm = evaluateSubmit();
+    if (isValid() && submitForm) {
+      submitForm(repo, initRepository);
     }
   };
 
-  isCreateMode = () => {
-    return !this.props.repository;
+  const evaluateSubmit = () => {
+    if (isImportPage()) {
+      return importRepository;
+    } else if (isCreatePage()) {
+      return createRepository;
+    } else {
+      return modifyRepository;
+    }
   };
 
-  isModifiable = () => {
-    return !!this.props.repository && !!this.props.repository._links.update;
+  const isEditMode = () => {
+    return !!repository;
   };
 
-  toggleInitCheckbox = () => {
-    this.setState({
-      initRepository: !this.state.initRepository
-    });
+  const isModifiable = () => {
+    return !!repository && !!repository._links.update;
   };
 
-  setCreationContextEntry = (key: string, value: any) => {
-    this.setState({
-      repository: {
-        ...this.state.repository,
-        contextEntries: {
-          ...this.state.repository.contextEntries,
-          [key]: value
-        }
+  const toggleInitCheckbox = () => {
+    setInitRepository(!initRepository);
+  };
+
+  const setCreationContextEntry = (key: string, value: any) => {
+    setRepo({
+      ...repo,
+      contextEntries: {
+        ...repo.contextEntries,
+        [key]: value
       }
     });
   };
 
-  render() {
-    const { loading, t } = this.props;
-    const repository = this.state.repository;
-
-    const disabled = !this.isModifiable() && !this.isCreateMode();
-
-    const submitButton = disabled ? null : (
-      <Level right={<SubmitButton disabled={!this.isValid()} loading={loading} label={t("repositoryForm.submit")} />} />
-    );
-
-    let subtitle = null;
-    if (this.props.repository) {
-      // edit existing repo
-      subtitle = <Subtitle subtitle={t("repositoryForm.subtitle")} />;
+  const resolveLocation = () => {
+    const currentUrl = location.pathname;
+    if (currentUrl.includes("/repos/create")) {
+      return "create";
     }
+    if (currentUrl.includes("/repos/import")) {
+      return "import";
+    }
+    return "";
+  };
 
-    return (
-      <>
-        {subtitle}
-        <form onSubmit={this.submit}>
-          {this.renderCreateOnlyFields()}
-          <InputField
-            label={t("repository.contact")}
-            onChange={this.handleContactChange}
-            value={repository ? repository.contact : ""}
-            validationError={this.state.contactValidationError}
-            errorMessage={t("validation.contact-invalid")}
-            helpText={t("help.contactHelpText")}
-            disabled={disabled}
-          />
+  const isImportPage = () => {
+    return resolveLocation() === "import";
+  };
 
-          <Textarea
-            label={t("repository.description")}
-            onChange={this.handleDescriptionChange}
-            value={repository ? repository.description : ""}
-            helpText={t("help.descriptionHelpText")}
-            disabled={disabled}
-          />
-          {submitButton}
-        </form>
-      </>
-    );
-  }
+  const isCreatePage = () => {
+    return resolveLocation() === "create";
+  };
 
-  createSelectOptions(repositoryTypes?: RepositoryType[]) {
+  const createSelectOptions = (repositoryTypes?: RepositoryType[]) => {
     if (repositoryTypes) {
       return repositoryTypes.map(repositoryType => {
         return {
@@ -197,18 +185,16 @@ class RepositoryForm extends React.Component<Props, State> {
       });
     }
     return [];
-  }
+  };
 
-  renderNamespaceField = () => {
-    const { namespaceStrategy, t } = this.props;
-    const repository = this.state.repository;
+  const renderNamespaceField = () => {
     const props = {
       label: t("repository.namespace"),
       helpText: t("help.namespaceHelpText"),
-      value: repository ? repository.namespace : "",
-      onChange: this.handleNamespaceChange,
+      value: repo ? repo.namespace : "",
+      onChange: handleNamespaceChange,
       errorMessage: t("validation.namespace-invalid"),
-      validationError: this.state.namespaceValidationError
+      validationError: namespaceValidationError
     };
 
     if (namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY) {
@@ -218,25 +204,63 @@ class RepositoryForm extends React.Component<Props, State> {
     return <ExtensionPoint name="repos.create.namespace" props={props} renderAll={false} />;
   };
 
-  renderCreateOnlyFields() {
-    if (!this.isCreateMode()) {
+  const renderUrlImportFields = () => {
+    if (!isImportPage()) {
+      return null;
+    }
+
+    return (
+      <>
+        <Columns className="columns is-multiline">
+          <Column className="column is-full">
+            <InputField
+              label={t("create.importUrl")}
+              onChange={handleImportUrlChange}
+              value={importUrl}
+              helpText={t("help.importUrlHelpText")}
+            />
+          </Column>
+          <Column className="column is-half">
+            <InputField
+              label={t("create.username")}
+              onChange={setUsername}
+              value={username}
+              helpText={t("help.usernameHelpText")}
+            />
+          </Column>
+          <Column className="column is-half">
+            <InputField
+              label={t("create.password")}
+              onChange={setPassword}
+              value={password}
+              type="password"
+              helpText={t("help.passwordHelpText")}
+            />
+          </Column>
+        </Columns>
+        <hr />
+      </>
+    );
+  };
+
+  const renderCreateOnlyFields = () => {
+    if (isEditMode()) {
       return null;
     }
-    const { repositoryTypes, indexResources, t } = this.props;
-    const repository = this.state.repository;
     const extensionProps = {
-      repository,
-      setCreationContextEntry: this.setCreationContextEntry,
+      repository: repo,
+      setCreationContextEntry: setCreationContextEntry,
       indexResources
     };
     return (
       <>
-        {this.renderNamespaceField()}
+        {renderUrlImportFields()}
+        {renderNamespaceField()}
         <InputField
           label={t("repository.name")}
-          onChange={this.handleNameChange}
-          value={repository ? repository.name : ""}
-          validationError={this.state.nameValidationError}
+          onChange={handleNameChange}
+          value={repo ? repo.name : ""}
+          validationError={nameValidationError}
           errorMessage={t("validation.name-invalid")}
           helpText={t("help.nameHelpText")}
         />
@@ -244,75 +268,94 @@ class RepositoryForm extends React.Component<Props, State> {
           <SelectWrapper>
             <Select
               label={t("repository.type")}
-              onChange={this.handleTypeChange}
-              value={repository ? repository.type : ""}
-              options={this.createSelectOptions(repositoryTypes)}
+              onChange={type => setRepo({ ...repo, type })}
+              value={repo ? repo.type : ""}
+              options={createSelectOptions(repositoryTypes)}
               helpText={t("help.typeHelpText")}
             />
           </SelectWrapper>
-          <CheckboxWrapper>
-            <Checkbox
-              label={t("repositoryForm.initializeRepository")}
-              checked={this.state.initRepository}
-              onChange={this.toggleInitCheckbox}
-              helpText={t("help.initializeRepository")}
-            />
-            {this.state.initRepository && (
-              <ExtensionPoint name="repos.create.initialize" props={extensionProps} renderAll={true} />
-            )}
-          </CheckboxWrapper>
+          {!isImportPage() && (
+            <CheckboxWrapper>
+              <Checkbox
+                label={t("repositoryForm.initializeRepository")}
+                checked={initRepository}
+                onChange={toggleInitCheckbox}
+                helpText={t("help.initializeRepository")}
+              />
+              {initRepository && (
+                <ExtensionPoint name="repos.create.initialize" props={extensionProps} renderAll={true} />
+              )}
+            </CheckboxWrapper>
+          )}
         </SpaceBetween>
       </>
     );
-  }
-
-  handleNamespaceChange = (namespace: string) => {
-    this.setState({
-      namespaceValidationError: !validator.isNamespaceValid(namespace),
-      repository: {
-        ...this.state.repository,
-        namespace
-      }
-    });
   };
 
-  handleNameChange = (name: string) => {
-    this.setState({
-      nameValidationError: !validator.isNameValid(name),
-      repository: {
-        ...this.state.repository,
-        name
-      }
-    });
+  const handleNamespaceChange = (namespace: string) => {
+    setNamespaceValidationError(!validator.isNamespaceValid(namespace));
+    setRepo({ ...repo, namespace });
   };
 
-  handleTypeChange = (type: string) => {
-    this.setState({
-      repository: {
-        ...this.state.repository,
-        type
-      }
-    });
+  const handleNameChange = (name: string) => {
+    setNameValidationError(!validator.isNameValid(name));
+    setRepo({ ...repo, name });
   };
 
-  handleContactChange = (contact: string) => {
-    this.setState({
-      contactValidationError: !validator.isContactValid(contact),
-      repository: {
-        ...this.state.repository,
-        contact
-      }
-    });
+  const handleContactChange = (contact: string) => {
+    setContactValidationError(!validator.isContactValid(contact));
+    setRepo({ ...repo, contact });
   };
 
-  handleDescriptionChange = (description: string) => {
-    this.setState({
-      repository: {
-        ...this.state.repository,
-        description
+  const handleImportUrlChange = (url: string) => {
+    if (!repo.name) {
+      const match = url.match(/([^\/]+)\.git/i);
+      if (match && match[1]) {
+        setRepo({ ...repo, name: match[1] });
       }
-    });
+    }
+    setImportUrl(url);
   };
-}
 
-export default withTranslation("repos")(RepositoryForm);
+  const disabled = !isModifiable() && isEditMode();
+
+  const getSubmitButtonTranslationKey = () => {
+    return isImportPage() ? "repositoryForm.submitImport" : "repositoryForm.submitCreate";
+  };
+
+  const submitButton = disabled ? null : (
+    <Level
+      right={<SubmitButton disabled={!isValid()} loading={loading} label={t(getSubmitButtonTranslationKey())} />}
+    />
+  );
+
+  return (
+    <>
+      {!isEditMode() && (
+        <RepositoryFormSwitcher repository={repository} createMode={isImportPage() ? "IMPORT" : "CREATE"} />
+      )}
+      <form onSubmit={submit}>
+        {renderCreateOnlyFields()}
+        <InputField
+          label={t("repository.contact")}
+          onChange={handleContactChange}
+          value={repo ? repo.contact : ""}
+          validationError={contactValidationError}
+          errorMessage={t("validation.contact-invalid")}
+          helpText={t("help.contactHelpText")}
+          disabled={disabled}
+        />
+        <Textarea
+          label={t("repository.description")}
+          onChange={description => setRepo({ ...repo, description })}
+          value={repo ? repo.description : ""}
+          helpText={t("help.descriptionHelpText")}
+          disabled={disabled}
+        />
+        {submitButton}
+      </form>
+    </>
+  );
+};
+
+export default RepositoryForm;
diff --git a/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx b/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx
new file mode 100644
index 0000000000..4ea9559f95
--- /dev/null
+++ b/scm-ui/ui-webapp/src/repos/components/form/RepositoryFormSwitcher.tsx
@@ -0,0 +1,93 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2020-present Cloudogu GmbH and Contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import React, { FC } from "react";
+import styled from "styled-components";
+import { useTranslation } from "react-i18next";
+import { Button, ButtonAddons, Level, Subtitle } from "@scm-manager/ui-components";
+import { Repository } from "@scm-manager/ui-types";
+
+type Props = {
+  repository?: Repository;
+  createMode: "CREATE" | "IMPORT";
+};
+
+const TopLevel = styled(Level)`
+  margin-top: -2rem;
+`;
+
+const SmallButton = styled(Button)`
+  border-radius: 4px;
+  font-size: 1rem;
+  font-weight: 600;
+`;
+
+const RepositoryFormSwitcher: FC<Props> = ({ repository, createMode }) => {
+  const [t] = useTranslation("repos");
+
+  const isImportMode = () => {
+    return createMode === "IMPORT";
+  };
+
+  const isCreateMode = () => {
+    return createMode === "CREATE";
+  };
+
+  const renderSubtitle = () => {
+    let subtitle;
+    if (repository) {
+      subtitle = "repositoryForm.subtitle";
+    } else if (isImportMode()) {
+      subtitle = "create.importSubtitle";
+    } else {
+      subtitle = "create.createSubtitle";
+    }
+
+    return <Subtitle subtitle={t(subtitle)} />;
+  };
+
+  return (
+    <TopLevel
+      left={renderSubtitle()}
+      right={
+        <ButtonAddons>
+          <SmallButton
+            label={t("create.createButton")}
+            icon="fa fa-plus"
+            color={isCreateMode() ? "link is-selected" : undefined}
+            link={isImportMode() ? "/repos/create" : undefined}
+          />
+          <SmallButton
+            label={t("create.importButton")}
+            icon="fa fa-file-upload"
+            color={isImportMode() ? "link is-selected" : undefined}
+            link={isCreateMode() ? "/repos/import" : undefined}
+          />
+        </ButtonAddons>
+      }
+    />
+  );
+};
+
+export default RepositoryFormSwitcher;
diff --git a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
index c52a6b5e6f..95400b41c9 100644
--- a/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
+++ b/scm-ui/ui-webapp/src/repos/components/form/repositoryValidation.ts
@@ -25,10 +25,11 @@
 import { validation } from "@scm-manager/ui-components";
 
 const nameRegex = /(?!^\.\.$)(?!^\.$)(?!.*[.]git$)(?!.*[\\\[\]])^[A-Za-z0-9\.][A-Za-z0-9\.\-_]*$/;
-const namespaceExceptionsRegex = /^(([0-9]{1,3})|(create))$/;
+const namespaceExceptionsRegexCreate = /^(([0-9]{1,3})|(create))$/;
+const namespaceExceptionsRegexImport = /^(([0-9]{1,3})|(import))$/;
 
 export const isNamespaceValid = (name: string) => {
-  return nameRegex.test(name) && !namespaceExceptionsRegex.test(name);
+  return nameRegex.test(name) && !namespaceExceptionsRegexCreate.test(name) && !namespaceExceptionsRegexImport.test(name);
 };
 
 export const isNameValid = (name: string) => {
diff --git a/scm-ui/ui-webapp/src/repos/containers/Create.tsx b/scm-ui/ui-webapp/src/repos/containers/Create.tsx
index 2d65341321..e93809f641 100644
--- a/scm-ui/ui-webapp/src/repos/containers/Create.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/Create.tsx
@@ -95,7 +95,6 @@ class Create extends React.Component<Props> {
     return (
       <Page
         title={t("create.title")}
-        subtitle={t("create.subtitle")}
         loading={pageLoading}
         error={error}
         showContentOnError={true}
@@ -104,7 +103,7 @@ class Create extends React.Component<Props> {
           repositoryTypes={repositoryTypes}
           loading={createLoading}
           namespaceStrategy={namespaceStrategies.current}
-          submitForm={(repo, initRepository) => {
+          createRepository={(repo, initRepository) => {
             createRepo(repoLink, repo, initRepository, (repo: Repository) => this.repoCreated(repo));
           }}
           indexResources={indexResources}
diff --git a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
index 2f91c8421b..dfe540bc58 100644
--- a/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/EditRepo.tsx
@@ -75,7 +75,7 @@ class EditRepo extends React.Component<Props> {
         <RepositoryForm
           repository={this.props.repository}
           loading={loading}
-          submitForm={repo => {
+          createRepository={repo => {
             this.props.modifyRepo(repo, this.repoModified);
           }}
         />
diff --git a/scm-ui/ui-webapp/src/repos/containers/Overview.tsx b/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
index 0dae2f03d9..866c5fec5f 100644
--- a/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
+++ b/scm-ui/ui-webapp/src/repos/containers/Overview.tsx
@@ -25,7 +25,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { RouteComponentProps, withRouter } from "react-router-dom";
 import { WithTranslation, withTranslation } from "react-i18next";
-import { NamespaceCollection, RepositoryCollection } from "@scm-manager/ui-types";
+import { NamespaceCollection, RepositoryCollection, Link } from "@scm-manager/ui-types";
 import {
   CreateButton,
   LinkPaginator,
@@ -95,7 +95,8 @@ class Overview extends React.Component<Props> {
   getReposLink = () => {
     const { namespace, namespaces, reposLink } = this.props;
     if (namespace) {
-      return namespaces?._embedded.namespaces.find(n => n.namespace === namespace)?._links?.repositories?.href;
+      return (namespaces?._embedded.namespaces.find(n => n.namespace === namespace)?._links?.repositories as Link)
+        ?.href;
     } else {
       return reposLink;
     }