diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index 5eccf7745a9..28736d361ec 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -12,11 +12,14 @@
 // 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 UserContext s_adminContext = null;
+    private static final ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name);
+    private static final AccountService _accountMgr = locator.getManager(AccountService.class);
 
     private long userId;
     private String sessionId;
@@ -26,7 +29,9 @@ public class UserContext {
     private String eventDetails;
 
     private boolean apiServer;
-    
+
+    private static UserContext s_adminContext = new UserContext(_accountMgr.getSystemUser().getId(), _accountMgr.getSystemAccount(), null, false);
+
     public UserContext() {
     }
 
@@ -125,10 +130,4 @@ public class UserContext {
     public String getEventDetails() {
         return eventDetails;
     }
-
-    public static synchronized void setAdminContext(UserContext adminContext) {
-        if (adminContext == null) {
-            UserContext.s_adminContext = adminContext;
-        }
-    }
 }
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 0e78bcbe9c2..bf777d15092 100755
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -376,7 +376,6 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
     }
 
     protected void populateManagers() {
-        addManager("account manager", AccountManagerImpl.class);
         addManager("StackMaidManager", CheckPointManagerImpl.class);
         addManager("Cluster Manager", ClusterManagerImpl.class);
         addManager("ClusterFenceManager", ClusterFenceManagerImpl.class);
@@ -385,6 +384,7 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
         addManager("AsyncJobManager", AsyncJobManagerImpl.class);
         addManager("AsyncJobExecutorContext", AsyncJobExecutorContextImpl.class);
         addManager("configuration manager", ConfigurationManagerImpl.class);
+        addManager("account manager", AccountManagerImpl.class);
         addManager("domain manager", DomainManagerImpl.class);
         addManager("resource limit manager", ResourceLimitManagerImpl.class);
         addManager("network manager", NetworkManagerImpl.class);
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index dabe70a7675..8a568ce9512 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -290,9 +290,8 @@ public class VpcManagerImpl implements VpcManager, Manager{
         }
 
         svcProviderMap.put(Service.Gateway, defaultProviders);
-        VpcOffering offering = createVpcOffering(name, displayText, svcProviderMap, false, null);
-        UserContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name);
-        return offering;
+
+        return createVpcOffering(name, displayText, svcProviderMap, false, null);
     }
 
 
@@ -326,6 +325,7 @@ public class VpcManagerImpl implements VpcManager, Manager{
         }
         txn.commit();
 
+        UserContext.current().setEventDetails(" Id: " + offering.getId() + " Name: " + name);
         return offering;
     }
 
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 41ad8a21b3e..7f5d5828f2e 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -70,10 +70,15 @@ import com.cloud.network.IpAddress;
 import com.cloud.network.NetworkManager;
 import com.cloud.network.NetworkVO;
 import com.cloud.network.RemoteAccessVpnVO;
+import com.cloud.network.Site2SiteCustomerGatewayVO;
+import com.cloud.network.Site2SiteVpnConnectionVO;
 import com.cloud.network.VpnUserVO;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.RemoteAccessVpnDao;
+import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
+import com.cloud.network.dao.Site2SiteVpnConnectionDao;
+import com.cloud.network.dao.Site2SiteVpnGatewayDao;
 import com.cloud.network.dao.VpnUserDao;
 import com.cloud.network.security.SecurityGroupManager;
 import com.cloud.network.security.dao.SecurityGroupDao;
@@ -247,9 +252,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
         if (_userAuthenticators == null || !_userAuthenticators.isSet()) {
             s_logger.error("Unable to find an user authenticator.");
         }
-        
-        //initialize admin context
-        UserContext.setAdminContext(new UserContext(getSystemUser().getId(), getSystemAccount(), null, false));
 
         return true;
     }