diff --git a/apps/files_external/controller/usercredentialscontroller.php b/apps/files_external/controller/usercredentialscontroller.php
index 2944611d8a9da9ffbed0c30b61aff04bb1899717..bc514cba088d1da82397c54eb238db6887b8842e 100644
--- a/apps/files_external/controller/usercredentialscontroller.php
+++ b/apps/files_external/controller/usercredentialscontroller.php
@@ -49,7 +49,6 @@ class UserCredentialsController extends Controller {
 	 * @param string $password
 	 *
 	 * @NoAdminRequired
-	 * @NoCSRFRequired
 	 */
 	public function store($storageId, $username, $password) {
 		$this->authMechanism->saveCredentials($this->userSession->getUser(), $storageId, $username, $password);
diff --git a/apps/files_external/controller/userglobalstoragescontroller.php b/apps/files_external/controller/userglobalstoragescontroller.php
index 6d4548754dfa1d4f9f74325b7deeed621145434c..97b5c90e20ccfd804690ec41286d7b7ac7d9aaee 100644
--- a/apps/files_external/controller/userglobalstoragescontroller.php
+++ b/apps/files_external/controller/userglobalstoragescontroller.php
@@ -22,6 +22,8 @@
 namespace OCA\Files_External\Controller;
 
 use OCA\Files_External\Lib\Auth\AuthMechanism;
+use OCA\Files_External\Lib\Auth\Password\UserProvided;
+use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
@@ -135,6 +137,14 @@ class UserGlobalStoragesController extends StoragesController {
 	protected function sanitizeStorage(StorageConfig $storage) {
 		$storage->setBackendOptions([]);
 		$storage->setMountOptions([]);
+
+		if ($storage->getAuthMechanism() instanceof UserProvided) {
+			try {
+				$storage->getAuthMechanism()->manipulateStorageConfig($storage, $this->userSession->getUser());
+			} catch (InsufficientDataForMeaningfulAnswerException $e) {
+
+			}
+		}
 	}
 
 }