diff --git a/src/dbp-official-signature-pdf-upload.js b/src/dbp-official-signature-pdf-upload.js
index 10f6a1fc730d732d62e61c5024e39965d8d633f4..78aa6809809a800bdb00ab3f0fa9b2c6201493c5 100644
--- a/src/dbp-official-signature-pdf-upload.js
+++ b/src/dbp-official-signature-pdf-upload.js
@@ -43,6 +43,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
         this.queuedFilesSignaturePlacements = [];
         this.queuedFilesPlacementModes = [];
         this.currentPreviewQueueKey = '';
+
+
     }
 
     static get scopedElements() {
@@ -78,6 +80,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
             signaturePlacementInProgress: { type: Boolean, attribute: false },
             withSigBlock: { type: Boolean, attribute: false },
             isSignaturePlacement: { type: Boolean, attribute: false },
+
         };
     }
 
@@ -204,7 +207,6 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
      * @param ev
      */
     onFileSelected(ev) {
-        console.log("File was selected: ev", ev);
         this.queueFile(ev.detail.file);
     }
 
@@ -257,10 +259,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                     });
                     break;
             }
-
-            // console.log(propName, oldValue);
         });
-
         super.update(changedProperties);
     }
 
@@ -600,6 +599,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
      * @returns {*[]} Array of html templates
      */
     getQueuedFilesHtml() {
+
         const ids = Object.keys(this.queuedFiles);
         let results = [];
 
@@ -736,6 +736,7 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                             text="${i18n.t('official-pdf-upload.upload-area-text')}"
                             button-label="${i18n.t('official-pdf-upload.upload-button-label')}"
                             @dbp-file-source-file-selected="${this.onFileSelected}"
+                            @dbp-file-source-switched="${this.onFileSourceSwitch}"
                             ></dbp-file-source>
                     </div>
                 </div>
@@ -870,6 +871,8 @@ class OfficialSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitElem
                 nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${nextcloudWebDavURL}"
                 nextcloud-name="${nextcloudName}"
+                nextcloud-default="${this.nextcloudDefaultDir}"
+                default-sink="${this.fileSource}"
                 lang="${this.lang}"
                 ></dbp-file-sink>
         `;
diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index f382da9e04c3dda087ad3653ea4152bf6090d938..c82f8a42197ba89889ded3de79d2ad8bd8c1d1a6 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -152,7 +152,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
         });
 
         await this.uploadFile(file, params);
-        this.uploadInProgress = false;
+        this.uploadInProgr666666666666666ess = false;
     }
 
     storePDFData(event) {
@@ -896,6 +896,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                             text="${i18n.t('qualified-pdf-upload.upload-area-text')}"
                             button-label="${i18n.t('qualified-pdf-upload.upload-button-label')}"
                             @dbp-file-source-file-selected="${this.onFileSelected}"
+                            @dbp-file-source-switched="${this.onFileSourceSwitch}"
                             ></dbp-file-source>
                     </div>
                 </div>
@@ -1042,6 +1043,8 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
                 nextcloud-auth-url="${nextcloudWebAppPasswordURL}"
                 nextcloud-web-dav-url="${nextcloudWebDavURL}"
                 nextcloud-name="${nextcloudName}"
+                nextcloud-default="${this.nextcloudDefaultDir}"
+                default-sink="${this.fileSource}"
                 lang="${this.lang}"
                 ></dbp-file-sink>
         `;
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index 9e93096a2fc8cf9a9817af662511c818ade1cb61..d1420ff1fabd1b39638d3828bd776e183e3fded1 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -16,6 +16,9 @@ export default class DBPSignatureLitElement extends LitElement {
         this.fileSourceUrl = "";
 
         this.showTestNextcloudFilePicker = buildinfo.env !== 'production';
+
+        this.fileSource = '';
+        this.nextcloudDefaultDir = '';
     }
 
     /**
@@ -142,6 +145,17 @@ export default class DBPSignatureLitElement extends LitElement {
         this.onFileUploadFinished(data);
     }
 
+    onFileSourceSwitch(event)
+    {
+        if (event.detail.source) {
+            this.fileSource = event.detail.source;
+        }
+        if (event.detail.nextcloud) {
+            this.nextcloudDefaultDir = event.detail.nextcloud;
+        }
+        event.preventDefault();
+    }
+
     /**
      * @param data
      */
diff --git a/vendor/toolkit b/vendor/toolkit
index dcd4d7b101b8f87939496916a4d53d41867ac696..589b53991ce657d41916901c2a8a1b5b4da32e55 160000
--- a/vendor/toolkit
+++ b/vendor/toolkit
@@ -1 +1 @@
-Subproject commit dcd4d7b101b8f87939496916a4d53d41867ac696
+Subproject commit 589b53991ce657d41916901c2a8a1b5b4da32e55