diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index d2023503f09..28736d361ec 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -12,12 +12,13 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 package com.cloud.user;
 
+import com.cloud.server.ManagementService;
 import com.cloud.utils.component.ComponentLocator;
 
 public class UserContext {
 
     private static ThreadLocal<UserContext> s_currentContext = new ThreadLocal<UserContext>();
-    private static final ComponentLocator locator = ComponentLocator.getCurrentLocator();
+    private static final ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name);
     private static final AccountService _accountMgr = locator.getManager(AccountService.class);
 
     private long userId;