diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 52d100055e075e9754403cb6a7c777eff5c218de..5c5a6c7ec5c473689ef4e0f08ef57e08421b8ed9 100755
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -108,7 +108,8 @@ class Keymanager {
 		
 		\OC_FileProxy::$enabled = false;
 
-		$util = new Util($view, $userId);
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util($view, \OCP\User::getUser());
 		list($owner, $filename) = $util->getUidAndFilename($path);
 
 		$basePath = '/' . $owner . '/files_encryption/keyfiles';
@@ -168,7 +169,7 @@ class Keymanager {
 	 */
 	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
 		
-		$util = new Util($view, $userId);
+		$util = new Util($view, \OCP\User::getUser());
 		list($owner, $filename) = $util->getUidAndFilename($filePath);
 		$filePath_f = ltrim( $filename, '/' );
 		
@@ -298,7 +299,8 @@ class Keymanager {
 	 */
 	public static function setShareKey( \OC_FilesystemView $view, $path, $userId, $shareKey ) {
 
-		$util = new Util( $view, $userId );
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util( $view, \OCP\User::getUser() );
 
 		list($owner, $filename) = $util->getUidAndFilename($path);
 
@@ -368,7 +370,8 @@ class Keymanager {
 		
 		\OC_FileProxy::$enabled = false;
 
-		$util = new Util( $view, $userId );
+		//here we need the currently logged in user, while userId can be a different user
+		$util = new Util( $view, \OCP\User::getUser() );
 
 		list($owner, $filename) = $util->getUidAndFilename($filePath);