diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 6ea5f116..f79eaf72 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -14,6 +14,8 @@ definitions:
   services:
     postgres:
       image: postgres
+      variables:
+        POSTGRES_HOST_AUTH_METHOD: trust
 
 aliases:
 - &unittest-python
diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index 42166111..9bc2b8b3 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -15,6 +15,7 @@
         @changeDocumentUrl="changeDocumentUrl"
         @spellcheck="spellcheck"
         :user-input="submission"
+        :spellcheck-loading="spellcheckLoading"
         placeholder="Ergebnis erfassen"
         action="Ergebnis mit Lehrperson teilen"
         shared-msg="Das Ergebnis wurde mit der Lehrperson geteilt."
@@ -191,6 +192,7 @@
       },
       spellcheck() {
         let self = this;
+        this.spellcheckLoading = true;
         this.$apollo.mutate({
           mutation: SPELL_CHECK_MUTATION,
           variables: {
@@ -202,6 +204,8 @@
           update(store, {data: {spellCheck: {results}}}) {
             self.corrections = results;
           }
+        }).then(() => {
+          this.spellcheckLoading = false;
         });
       }
     },
@@ -239,7 +243,8 @@
         inputType: 'text',
         unsaved: false,
         saving: 0,
-        corrections: ''
+        corrections: '',
+        spellcheckLoading: false
       }
     }
   }
diff --git a/client/src/components/content-blocks/assignment/SubmissionForm.vue b/client/src/components/content-blocks/assignment/SubmissionForm.vue
index cdff5d19..985131bb 100644
--- a/client/src/components/content-blocks/assignment/SubmissionForm.vue
+++ b/client/src/components/content-blocks/assignment/SubmissionForm.vue
@@ -20,7 +20,7 @@
         class="submission-form-container__submit submission-form-container__spellcheck button button--primary button--white-bg"
         v-if="spellcheck"
         @click="$emit('spellcheck')"
-      >Rechtschreibung prüfen
+      >{{spellcheckText}}
       </button>
       <div v-if="userInput.document">
         <document-block
@@ -65,6 +65,10 @@
         type: Boolean,
         default: false
       },
+      spellcheckLoading: {
+        type: Boolean,
+        default: false
+      },
       sharedMsg: String
     },
 
@@ -81,6 +85,14 @@
       },
       allowsDocuments() {
         return 'document' in this.userInput;
+      },
+      spellcheckText() {
+        if (!this.spellcheckLoading) {
+          return 'Rechtschreibung prüfen'
+
+        } else {
+          return 'Wird geprüft...'
+        }
       }
     },
 
@@ -129,6 +141,13 @@
         cursor: pointer;
       }
     }
+
+    &__spellcheck {
+      /* so the button does not change size when changing the text */
+      width: 235px;
+      text-align: center;
+      display: inline-block;
+    }
   }
 
 </style>
diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py
index 8f3f6a20..8fd40684 100644
--- a/server/basicknowledge/queries.py
+++ b/server/basicknowledge/queries.py
@@ -39,3 +39,6 @@ class BasicKnowledgeQuery(object):
         if slug is not None:
             return BasicKnowledge.objects.get(slug=slug)
         return None
+
+    def resolve_instruments(self, info, **kwargs):
+        return BasicKnowledge.objects.all().live()