diff --git a/selfprivacy_api/backup/__init__.py b/selfprivacy_api/backup/__init__.py
index f6e2bfc..b340034 100644
--- a/selfprivacy_api/backup/__init__.py
+++ b/selfprivacy_api/backup/__init__.py
@@ -135,7 +135,7 @@ class Backups:
 
     @staticmethod
     def set_provider(kind: str, login: str, key: str, location: str, repo_id: str = ""):
-        provider = Backups.construct_provider(kind, login, key, location, id)
+        provider = Backups.construct_provider(kind, login, key, location, repo_id)
         Storage.store_provider(provider)
 
     @staticmethod
diff --git a/selfprivacy_api/graphql/mutations/backup_mutations.py b/selfprivacy_api/graphql/mutations/backup_mutations.py
index 898702a..ad43686 100644
--- a/selfprivacy_api/graphql/mutations/backup_mutations.py
+++ b/selfprivacy_api/graphql/mutations/backup_mutations.py
@@ -48,15 +48,17 @@ class BackupMutations:
         self, repository: InitializeRepositoryInput
     ) -> GenericBackupConfigReturn:
         """Initialize a new repository"""
-        provider = Backups.construct_provider(
-            kind=repository.provider,
+        Backups.set_provider(
+            kind=repository.provider.value,
             login=repository.login,
             key=repository.password,
             location=repository.location_name,
             repo_id=repository.location_id,
         )
-        Backups.set_provider(provider)
         Backups.init_repo()
+        return GenericBackupConfigReturn(
+            success=True, message="", code="200", configuration=Backup().configuration()
+        )
 
     @strawberry.mutation(permission_classes=[IsAuthenticated])
     def remove_repository(self) -> GenericBackupConfigReturn:
@@ -73,9 +75,7 @@ class BackupMutations:
         return Backup.configuration()
 
     @strawberry.mutation(permission_classes=[IsAuthenticated])
-    def start_backup(
-        self, service_id: typing.Optional[str] = None
-    ) -> GenericJobButationReturn:
+    def start_backup(self, service_id: str) -> GenericJobButationReturn:
         """Start backup"""
 
         service = get_service_by_id(service_id)
diff --git a/tests/test_graphql/test_api_backup.py b/tests/test_graphql/test_api_backup.py
index 660df95..3c9c7f2 100644
--- a/tests/test_graphql/test_api_backup.py
+++ b/tests/test_graphql/test_api_backup.py
@@ -1,3 +1,4 @@
+from os import path
 from tests.test_graphql.test_backup import dummy_service, backups, raw_dummy_service
 from tests.common import generate_backup_query
 
@@ -5,6 +6,23 @@ from tests.common import generate_backup_query
 from selfprivacy_api.graphql.common_types.service import service_to_graphql_service
 from selfprivacy_api.jobs import Jobs, JobStatus
 
+API_INIT_MUTATION = """
+mutation TestInitRepo($input: InitializeRepositoryInput!) {
+        initializeRepository(repository: $input) {
+            success
+            message
+            code
+            configuration { 
+                provider
+                encryptionKey
+                isInitialized
+                autobackupPeriod
+                locationName
+                locationId
+            }
+        }
+}
+"""
 
 API_RESTORE_MUTATION = """
 mutation TestRestoreService($snapshot_id: String!) {
@@ -67,6 +85,32 @@ def api_backup(authorized_client, service):
     return response
 
 
+def api_init_without_key(
+    authorized_client, kind, login, password, location_name, location_id
+):
+    response = authorized_client.post(
+        "/graphql",
+        json={
+            "query": API_INIT_MUTATION,
+            "variables": {
+                "input": {
+                    "provider": kind,
+                    "locationId": location_id,
+                    "locationName": location_name,
+                    "login": login,
+                    "password": password,
+                }
+            },
+        },
+    )
+    return response
+
+
+def assert_ok(data):
+    assert data["code"] == 200
+    assert data["success"] is True
+
+
 def get_data(response):
     assert response.status_code == 200
     response = response.json()
@@ -127,3 +171,25 @@ def test_restore(authorized_client, dummy_service):
     job = data["job"]
 
     assert Jobs.get_job(job["uid"]).status == JobStatus.FINISHED
+
+
+def test_reinit(authorized_client, dummy_service, tmpdir):
+    test_repo_path = path.join(tmpdir, "not_at_all_sus")
+    response = api_init_without_key(
+        authorized_client, "FILE", "", "", test_repo_path, ""
+    )
+    data = get_data(response)["initializeRepository"]
+    assert_ok(data)
+    configuration = data["configuration"]
+    assert configuration["provider"] == "FILE"
+    assert configuration["locationId"] == ""
+    assert configuration["locationName"] == test_repo_path
+    assert len(configuration["encryptionKey"]) > 1
+    assert configuration["isInitialized"] is True
+
+    response = api_backup(authorized_client, dummy_service)
+    data = get_data(response)["startBackup"]
+    assert data["success"] is True
+    job = data["job"]
+
+    assert Jobs.get_job(job["uid"]).status == JobStatus.FINISHED