diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index aa4c6393a06..b140728e596 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -16,12 +16,13 @@
 // under the License.
 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;