diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
index e4e2863af..397fd36dc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/NamespacesListingController.java
@@ -18,7 +18,6 @@ import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.util.iterator.ClosableIterator;
 
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
@@ -40,8 +39,6 @@ public class NamespacesListingController extends BaseEditController {
             t.printStackTrace();
         }
                
-        LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
-
         OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
                
         ArrayList results = new ArrayList();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
index 98ac8925f..530246e4f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/RestrictionsListingController.java
@@ -25,7 +25,6 @@ import com.hp.hpl.jena.shared.Lock;
 import com.hp.hpl.jena.util.iterator.ClosableIterator;
 
 import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
@@ -58,8 +57,6 @@ public class RestrictionsListingController extends BaseEditController {
         
         epo = super.createEpo(request);
         
-        LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
-
         OntModel ontModel = (OntModel) getServletContext().getAttribute("jenaOntModel");
         
         ObjectPropertyDao opDao = vrequest.getFullWebappDaoFactory().getObjectPropertyDao();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java
index 5ea9aee36..68c0345af 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/jena/StatementChangeListingController.java
@@ -24,7 +24,7 @@ import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.Resource;
 
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vedit.controller.BaseEditController;
 import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.beans.User;
@@ -59,7 +59,7 @@ public class StatementChangeListingController extends BaseEditController {
         
         try {
         	
-        LoginFormBean loginBean = (LoginFormBean) request.getSession().getAttribute("loginHandler");
+        LoginStatusBean loginBean = LoginStatusBean.getBean(vrequest);
         
         // TODO: need to make this more restrictive
         String userURI = (request.getParameter("userURI") != null) ? request.getParameter("userURI") : loginBean.getUserURI();
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java
index 54ac0d730..07207a48d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/SessionTimeoutLimitingFilter.java
@@ -13,7 +13,7 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 
 /**
  * Manipulate the maximum inactive interval on sessions.
@@ -56,8 +56,7 @@ public class SessionTimeoutLimitingFilter implements Filter {
 		}
 
 		// If logged in, leave it alone.
-		Object loginBean = session.getAttribute("loginHandler");
-		if (loginBean instanceof LoginFormBean) {
+		if (LoginStatusBean.getBean(request).isLoggedIn()) {
 			return;
 		}
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/AuthFlag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/AuthFlag.java
index d074a0788..6361a4bf2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/AuthFlag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/AuthFlag.java
@@ -2,10 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.flags;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
 
 public class AuthFlag {
     private boolean filterByAuthLevel = true;
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToAuthFlag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToAuthFlag.java
index 50ed8a008..8b5ae1f8d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToAuthFlag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToAuthFlag.java
@@ -2,11 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.flags;
 
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
-import edu.cornell.mannlib.vitro.webapp.flags.AuthFlag;
-
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 
 /**
  * Created by IntelliJ IDEA.
@@ -18,23 +16,7 @@ import javax.servlet.http.HttpSession;
 public class RequestToAuthFlag {
     public static AuthFlag makeAuthFlag(HttpServletRequest request){
         AuthFlag authFlag = new AuthFlag();
-        authFlag.setUserSecurityLevel(0);
-
-        HttpSession currentSession = request.getSession();
-        if( currentSession == null )
-            return authFlag;
-
-        LoginFormBean f = (LoginFormBean) currentSession.getAttribute( "loginHandler" );
-        if (f!=null) {
-            if (f.getLoginStatus().equals("authenticated")) { // test if session is still valid
-                if (currentSession.getId().equals(f.getSessionId())) {
-                    if (request.getRemoteAddr().equals(f.getLoginRemoteAddr())) {
-                        authFlag.setUserSecurityLevel(Integer.parseInt(f.getLoginRole()));
-                    }
-                }
-            }
-        }
-
+        authFlag.setUserSecurityLevel(LoginStatusBean.getBean(request).getSecurityLevel());
         return authFlag;
     }
 }
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java
index 43e1e13c8..11f03dff7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/flags/RequestToPortalFlag.java
@@ -10,7 +10,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
-import edu.cornell.mannlib.vedit.beans.LoginFormBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
 import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.beans.Portal;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
@@ -180,16 +180,7 @@ public class RequestToPortalFlag {
         if (authFlag!=null) {
             currentUserSecurityLevel=authFlag.getUserSecurityLevel();
         } else {
-            LoginFormBean f = (LoginFormBean) currentSession.getAttribute( "loginHandler" );
-            if (f!=null) {
-                if (f.getLoginStatus().equals("authenticated")) { // test if session is still valid
-                    if (currentSession.getId().equals(f.getSessionId())) {
-                        if (request.getRemoteAddr().equals(f.getLoginRemoteAddr())) {
-                            currentUserSecurityLevel=Integer.parseInt(f.getLoginRole());
-                        }
-                    }
-                }
-            }
+        	currentUserSecurityLevel=LoginStatusBean.getBean(request).getSecurityLevel();
         }
 
         if (portalFlag.isFilteringActive() ){