diff --git a/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java b/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
index 603643fa..6b12e9f6 100644
--- a/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
+++ b/core/src/main/java/org/apache/sqoop/security/AuthenticationManager.java
@@ -33,12 +33,6 @@ public class AuthenticationManager implements Reconfigurable {
    */
   public static final String DEFAULT_AUTHENTICATION_HANDLER = "org.apache.sqoop.security.authentication.SimpleAuthenticationHandler";
 
-
-  /**
-   * Default authentication auto upgrade option value
-   */
-  protected static boolean DEFAULT_AUTO_UPGRADE = false;
-
   /**
    * Private instance to singleton of this class.
    */
@@ -51,6 +45,11 @@ public class AuthenticationManager implements Reconfigurable {
     instance = new AuthenticationManager();
   }
 
+  /**
+   * The private constructor for the singleton class,
+   */
+  private AuthenticationManager(){}
+
   /**
    * Return current instance.
    *
@@ -73,16 +72,16 @@ public static void setInstance(AuthenticationManager newInstance) {
   }
 
   /**
-   * Private AuthenticiationHandler to singleton of this class.
+   * Private Authentication Handler to singleton of this class.
    */
-  private static AuthenticationHandler authenticationHandler;
+  private AuthenticationHandler authenticationHandler;
 
   /**
    * Return current authentication handler.
    *
    * @return Current authentication handler
    */
-  public static AuthenticationHandler getAuthenticationHandler() {
+  public AuthenticationHandler getAuthenticationHandler() {
     return authenticationHandler;
   }
 
diff --git a/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java b/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
index 76998625..4afdf021 100644
--- a/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
+++ b/core/src/main/java/org/apache/sqoop/security/AuthorizationManager.java
@@ -18,7 +18,6 @@
 package org.apache.sqoop.security;
 
 import org.apache.log4j.Logger;
-import org.apache.sqoop.common.MapContext;
 import org.apache.sqoop.core.Reconfigurable;
 import org.apache.sqoop.core.SqoopConfiguration;
 
@@ -44,11 +43,6 @@ public class AuthorizationManager implements Reconfigurable {
    */
   public static final String DEFAULT_SERVER_NAME = "SqoopServer1";
 
-  /**
-   * Default authorization auto upgrade option value
-   */
-  protected static boolean DEFAULT_AUTO_UPGRADE = false;
-
   /**
    * Private instance to singleton of this class.
    */
@@ -61,6 +55,11 @@ public class AuthorizationManager implements Reconfigurable {
     instance = new AuthorizationManager();
   }
 
+  /**
+   * The private constructor for the singleton class,
+   */
+  private AuthorizationManager(){}
+
   /**
    * Return current instance.
    *
@@ -83,16 +82,16 @@ public static void setInstance(AuthorizationManager newInstance) {
   }
 
   /**
-   * Private AuthenticiationHandler to singleton of this class.
+   * Private Authorization Handler to singleton of this class.
    */
-  private static AuthorizationHandler authorizationHandler;
+  private AuthorizationHandler authorizationHandler;
 
   /**
    * Return current authorization handler.
    *
    * @return Current authorization handler
    */
-  public static AuthorizationHandler getAuthorizationHandler() {
+  public AuthorizationHandler getAuthorizationHandler() {
     return authorizationHandler;
   }
 
diff --git a/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
index 57e0da59..358a8bdc 100644
--- a/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
+++ b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java
@@ -164,7 +164,7 @@ private static MPrivilege getPrivilege(MResource.TYPE resourceType,
   }
 
   private static void checkPrivilege(String doUserName, MPrivilege... privileges) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
 
     MPrincipal principal = new MPrincipal(doUserName, MPrincipal.TYPE.USER);
 
diff --git a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
index a7304130..bdac1de9 100644
--- a/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/AuthorizationRequestHandler.java
@@ -133,7 +133,7 @@ public JsonBean handleEvent(RequestContext ctx) {
   }
 
   private JsonBean getRoles(RequestContext ctx) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
     String principal_name = ctx.getParameterValue(PRINCIPAL_NAME_QUERY_PARAM);
     String principal_type = ctx.getParameterValue(PRINCIPAL_TYPE_QUERY_PARAM);
@@ -153,7 +153,7 @@ private JsonBean getRoles(RequestContext ctx) {
   }
 
   private JsonBean getPrincipal(RequestContext ctx) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
     String role_name = ctx.getParameterValue(ROLE_NAME_QUERY_PARAM);
 
@@ -201,7 +201,7 @@ private void checkResourceExists(MResource resource) {
   }
 
   private JsonBean getPrivilege(RequestContext ctx) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
     String principal_name = ctx.getParameterValue(PRINCIPAL_NAME_QUERY_PARAM);
     String principal_type = ctx.getParameterValue(PRINCIPAL_TYPE_QUERY_PARAM);
@@ -225,7 +225,7 @@ private JsonBean getPrivilege(RequestContext ctx) {
   }
 
   private JsonBean createRole(RequestContext ctx) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
 
     RoleBean bean = new RoleBean();
@@ -253,7 +253,7 @@ private JsonBean createRole(RequestContext ctx) {
   }
 
   private JsonBean grantRevokeRole(RequestContext ctx, boolean isGrant) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
 
     RolesBean rolesBean = new RolesBean();
@@ -285,7 +285,7 @@ private JsonBean grantRevokeRole(RequestContext ctx, boolean isGrant) {
   }
 
   private JsonBean grantRevokePrivilege(RequestContext ctx, boolean isGrant) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
 
     PrincipalsBean principalsBean = new PrincipalsBean();
@@ -330,7 +330,7 @@ private JsonBean grantRevokePrivilege(RequestContext ctx, boolean isGrant) {
   }
 
   private JsonBean dropRole(RequestContext ctx) {
-    AuthorizationHandler handler = AuthorizationManager.getAuthorizationHandler();
+    AuthorizationHandler handler = AuthorizationManager.getInstance().getAuthorizationHandler();
     AuditLoggerManager manager = AuditLoggerManager.getInstance();
 
     String[] urlElements = ctx.getUrlElements();
diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
index 0d060857..7f8ddbd0 100644
--- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
@@ -147,7 +147,7 @@ private JsonBean deleteJob(RequestContext ctx) {
         ctx.getRequest().getRemoteAddr(), "delete", "job", jobIdentifier);
     repository.deleteJob(jobId);
     MResource resource = new MResource(String.valueOf(jobId), MResource.TYPE.JOB);
-    AuthorizationManager.getAuthorizationHandler().removeResource(resource);
+    AuthorizationManager.getInstance().getAuthorizationHandler().removeResource(resource);
     return JsonBean.EMPTY_BEAN;
   }
 
diff --git a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
index f056686f..8a6beb8f 100644
--- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
+++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java
@@ -102,7 +102,7 @@ private JsonBean deleteLink(RequestContext ctx) {
 
     repository.deleteLink(linkId);
     MResource resource = new MResource(String.valueOf(linkId), MResource.TYPE.LINK);
-    AuthorizationManager.getAuthorizationHandler().removeResource(resource);
+    AuthorizationManager.getInstance().getAuthorizationHandler().removeResource(resource);
     return JsonBean.EMPTY_BEAN;
   }
 
diff --git a/server/src/main/java/org/apache/sqoop/server/RequestContext.java b/server/src/main/java/org/apache/sqoop/server/RequestContext.java
index 01aed41b..492440ff 100644
--- a/server/src/main/java/org/apache/sqoop/server/RequestContext.java
+++ b/server/src/main/java/org/apache/sqoop/server/RequestContext.java
@@ -121,7 +121,7 @@ public Locale getAcceptLanguageHeader() {
    * @return Name of user sending the request
    */
   public String getUserName() {
-    if (AuthenticationManager.getAuthenticationHandler().isSecurityEnabled()) {
+    if (AuthenticationManager.getInstance().getAuthenticationHandler().isSecurityEnabled()) {
       return HttpUserGroupInformation.get().getShortUserName();
     } else {
       return request.getParameter(PseudoAuthenticator.USER_NAME);