diff --git a/apps/encryption/lib/crypto/decryptall.php b/apps/encryption/lib/crypto/decryptall.php
index d7cd422c5e9bd851a4f9107d1ab7d72816ea3a64..1daf3699d13ea6266ea2f9ac9ab3b109b57580ef 100644
--- a/apps/encryption/lib/crypto/decryptall.php
+++ b/apps/encryption/lib/crypto/decryptall.php
@@ -84,6 +84,9 @@ class DecryptAll {
 		$recoveryKeyId = $this->keyManager->getRecoveryKeyId();
 
 		if (!empty($user)) {
+			$output->writeln('You can only decrypt the users files if you know');
+			$output->writeln('the users password or if he activated the recovery key.');
+			$output->writeln('');
 			$questionUseLoginPassword = new ConfirmationQuestion(
 				'Do you want to use the users login password to decrypt all files? (y/n) ',
 				false
@@ -98,6 +101,9 @@ class DecryptAll {
 				$user = $recoveryKeyId;
 			}
 		} else {
+			$output->writeln('You can only decrypt the files of all users if the');
+			$output->writeln('recovery key is enabled by the admin and activated by the users.');
+			$output->writeln('');
 			$user = $recoveryKeyId;
 		}
 
diff --git a/lib/private/encryption/decryptall.php b/lib/private/encryption/decryptall.php
index c1875f16abd087656f2e5bc9f0c36587d3adadb8..e19ee6b745f32ed5b5c72e4ffa723c010138ceba 100644
--- a/lib/private/encryption/decryptall.php
+++ b/lib/private/encryption/decryptall.php
@@ -119,6 +119,9 @@ class DecryptAll {
 		foreach ($encryptionModules as $moduleDesc) {
 			/** @var IEncryptionModule $module */
 			$module = call_user_func($moduleDesc['callback']);
+			$this->output->writeln('');
+			$this->output->writeln('Prepare "' . $module->getDisplayName() . '"');
+			$this->output->writeln('');
 			if ($module->prepareDecryptAll($this->input, $this->output, $user) === false) {
 				$this->output->writeln('Module "' . $moduleDesc['displayName'] . '" does not support the functionality to decrypt all files again or the initialization of the module failed!');
 				return false;