diff --git a/lib/server.php b/lib/server.php
index b09d380b0e962e70987b7b45614b014d9b3ead88..f3c79aa797f501b6ba8751e8e907880dac83cd64 100644
--- a/lib/server.php
+++ b/lib/server.php
@@ -49,10 +49,11 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('PreviewManager', function($c) {
 			return new PreviewManager();
 		});
-		$this->registerService('TagManager', function($c){
-			return new Tags();
+		$this->registerService('TagManager', function($c) {
+			$user = \OC_User::getUser();
+			return new Tags($user);
 		});
-		$this->registerService('RootFolder', function($c){
+		$this->registerService('RootFolder', function($c) {
 			// TODO: get user and user manager from container as well
 			$user = \OC_User::getUser();
 			/** @var $c SimpleContainer */