diff --git a/client/src/components/content-blocks/DocumentBlock.vue b/client/src/components/content-blocks/DocumentBlock.vue
index 0122b080..4116ec3e 100644
--- a/client/src/components/content-blocks/DocumentBlock.vue
+++ b/client/src/components/content-blocks/DocumentBlock.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="document-block">
     <document-icon class="document-block__icon"></document-icon>
-    <a :href="value.url" class="document-block__link" target="_blank">{{value.url}}</a>
+    <a :href="value.url" class="document-block__link" target="_blank">{{urlName}}</a>
   </div>
 </template>
 
@@ -13,6 +13,16 @@
 
     components: {
       DocumentIcon
+    },
+
+    computed: {
+      urlName: function() {
+        if (this.value && this.value.url) {
+          const parts = this.value.url.split('/');
+          return parts[parts.length - 1]
+        }
+        return null;
+      }
     }
   }
 </script>
diff --git a/client/src/components/content-forms/DocumentForm.vue b/client/src/components/content-forms/DocumentForm.vue
index 588d3c57..885300b2 100644
--- a/client/src/components/content-forms/DocumentForm.vue
+++ b/client/src/components/content-forms/DocumentForm.vue
@@ -21,13 +21,16 @@
       // HACK to change the text of the Uploadcare dynamically we need to change the text here directly
       setTimeout(() => {
         const formElem = this.$refs['documentform'];
-        formElem.getElementsByClassName('uploadcare--text_size_extra-large')[1].innerText = 'Ziehen Sie ein Dokument hier hinein';
-        formElem.getElementsByClassName('uploadcare--tab__action-button')[0].innerText = 'Wählen Sie ein lokales Dokument';
+        if (formElem.getElementsByClassName('uploadcare--text_size_extra-large').length > 1) {
+          formElem.getElementsByClassName('uploadcare--text_size_extra-large')[1].innerText = 'Ziehen Sie ein Dokument hier hinein';
+          formElem.getElementsByClassName('uploadcare--tab__action-button')[0].innerText = 'Wählen Sie ein lokales Dokument';
+        }
       }, 0);
 
       uploadcarePanel.done(panelResult => {
         panelResult.done(fileInfo => {
-          this.$emit('link-change-url', fileInfo.cdnUrl, this.index)
+          let urlWithFilename = fileInfo.cdnUrl + fileInfo.name;
+          this.$emit('link-change-url', urlWithFilename, this.index)
         });
 
         panelResult.progress(p => {
diff --git a/client/src/components/content-forms/ImageForm.vue b/client/src/components/content-forms/ImageForm.vue
index 2f159bbc..a4c52892 100644
--- a/client/src/components/content-forms/ImageForm.vue
+++ b/client/src/components/content-forms/ImageForm.vue
@@ -20,7 +20,6 @@
 
       uploadcarePanel.done(panelResult => {
         panelResult.done(fileInfo => {
-          console.log(fileInfo);
           this.$emit('link-change-url', fileInfo.cdnUrl, this.index)
         });