diff --git a/src/components/tabs/CommentsTab.vue b/src/components/tabs/CommentsTab.vue
index a299ab2..8eeedb0 100644
--- a/src/components/tabs/CommentsTab.vue
+++ b/src/components/tabs/CommentsTab.vue
@@ -89,8 +89,13 @@ export default {
         date: new Date()
       }
 
-      saveComment(comment)
-      this.$router.go()
+      saveComment(comment, this.contract.id)
+        .then(resp => {
+          this.$router.go()
+        })
+        .catch(error => {
+          this.$router.push('/error?message=' + error.message + '&code=' + error.code)
+        })
     }
   }
 }
diff --git a/src/components/tabs/ContractTab.vue b/src/components/tabs/ContractTab.vue
index 647ec99..aef0712 100644
--- a/src/components/tabs/ContractTab.vue
+++ b/src/components/tabs/ContractTab.vue
@@ -4,7 +4,8 @@
       <!-- Draw buttons by roles -->
       <button
         type="button"
-        class="inline-block px-6 mr-3 py-2.5 bg-green-500 text-white font-medium text-xs rounded shadow-md">
+        class="inline-block px-6 mr-3 py-2.5 bg-green-500 text-white font-medium text-xs rounded shadow-md"
+        @click="nextStep()">
         Nächstes Schritt
       </button>
       <button
@@ -111,12 +112,25 @@
   </div>
 </template>
 <script>
+import { moveToNextStep } from '../../service/ContractsService'
+
 export default {
   props: {
     contract: {
       type: Object,
       default: () => ({})
     }
+  },
+  methods: {
+    async nextStep() {
+      await moveToNextStep(this.contract.id)
+        .then(resp => {
+          this.$router.go()
+        })
+        .catch(error => {
+          this.$router.push('/error?message=' + error.message + '&code=' + error.code)
+        })
+    }
   }
 }
 </script>
diff --git a/src/service/ContractsService.js b/src/service/ContractsService.js
index 3834cad..2c09ec6 100644
--- a/src/service/ContractsService.js
+++ b/src/service/ContractsService.js
@@ -93,7 +93,7 @@ export async function createContract(contractId, contractName, contractClient, c
 }
 
 export async function deleteContract(contractId) {
-  return HttpClient.delete('/contract', {
+  return HttpClient.delete('/contract/delete', {
     id: contractId
   })
     .then(resp => {
@@ -106,14 +106,12 @@ export async function deleteContract(contractId) {
     })
 }
 
-export async function saveComment(comment) {
-  return HttpClient.post('/comments', comment)
-    .then(resp => {
-      //TODO: send also auth token with request
-      return resp.data
-    })
-    .catch(error => {
-      console.error(error)
-      router.push('/error?message=' + error.message + '&code=' + error.code)
-    })
+export async function saveComment(comment, contractId) {
+  return HttpClient.post('/contract/' + contractId + '/comments', comment)
+}
+
+export async function moveToNextStep(contractId) {
+  return HttpClient.post('/contract/nextstep', {
+    id: contractId
+  })
 }