diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 6d666cb..c090c27 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -33,7 +33,7 @@ class Application extends App {
 		 * Core
 		 */
 		$container->registerService('UserId', function(IContainer $c) {
-			return \OCP\User::getUser();
+			return \OC::$server->getUserSession()->getUser()->getUID();
 		});
 
 		$container->registerService('Config', function($c) {