diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 3c810ca6..f5ba415e 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -177,6 +177,14 @@ class WopiController extends Controller {
 			// Setup the FS which is needed to emit hooks (versioning).
 			\OC_Util::tearDownFS();
 			\OC_Util::setupFS($res['owner']);
+
+			// Set the user to register the change under his name
+			$editor = \OC::$server->getUserManager()->get($res['editor']);
+			if (is_null($editor)) {
+				throw new \OC\User\NoUserException("User " . $res['editor'] . "not found.");
+			}
+			\OC::$server->getUserSession()->setUser($editor);
+
 			$file->putContent($content);
 			return new JSONResponse();
 		} catch (\Exception $e) {