diff --git a/webapp/web/admin/conceptRepair.jsp b/webapp/web/admin/conceptRepair.jsp
index dfd73eea0..ceaf69ad9 100644
--- a/webapp/web/admin/conceptRepair.jsp
+++ b/webapp/web/admin/conceptRepair.jsp
@@ -2,11 +2,11 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
+<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%
-    if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+	if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         %><c:redirect url="<%= Controllers.LOGIN %>" /><%
     }
   
diff --git a/webapp/web/admin/gotoIndividual.jsp b/webapp/web/admin/gotoIndividual.jsp
index 8cba7ef06..7ee02c613 100644
--- a/webapp/web/admin/gotoIndividual.jsp
+++ b/webapp/web/admin/gotoIndividual.jsp
@@ -2,13 +2,13 @@
 
 <%@page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
-<%@page import="edu.cornell.mannlib.vedit.beans.LoginFormBean"%>
+<%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
 
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
 
 <%
 
-if (session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) {
+if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
     %><c:redirect url="<%= Controllers.LOGIN %>" /><%
 }
 
diff --git a/webapp/web/admin/log4j.jsp b/webapp/web/admin/log4j.jsp
index 3d436ba0f..4d67e744f 100644
--- a/webapp/web/admin/log4j.jsp
+++ b/webapp/web/admin/log4j.jsp
@@ -1,6 +1,6 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
+<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 <%@ page import="org.apache.log4j.*" %>
 <%@ page import="java.util.*" %>
@@ -15,7 +15,7 @@
   based on work by Volker Mentzner. --%>
 
 <%
-if (session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) {
+if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
     %><c:redirect url="<%= Controllers.LOGIN %>" /><%
 }
 
diff --git a/webapp/web/admin/removeBadRestrictions.jsp b/webapp/web/admin/removeBadRestrictions.jsp
index 1abd7c941..4b66b179f 100644
--- a/webapp/web/admin/removeBadRestrictions.jsp
+++ b/webapp/web/admin/removeBadRestrictions.jsp
@@ -2,11 +2,11 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
+<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
 
 
 <%
-    if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+	if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         %><c:redirect url="/siteAdmin"></c:redirect><%
     }
   
diff --git a/webapp/web/admin/removeResourceDescription.jsp b/webapp/web/admin/removeResourceDescription.jsp
index 9e7971c5d..0c2b87c31 100644
--- a/webapp/web/admin/removeResourceDescription.jsp
+++ b/webapp/web/admin/removeResourceDescription.jsp
@@ -2,11 +2,11 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
+<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%
-    if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+	if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         %><c:redirect url="<%= Controllers.LOGIN %>" /><%
     }
     
diff --git a/webapp/web/admin/syncSesame.jsp b/webapp/web/admin/syncSesame.jsp
index 95602e394..89afb3c38 100644
--- a/webapp/web/admin/syncSesame.jsp
+++ b/webapp/web/admin/syncSesame.jsp
@@ -9,7 +9,7 @@
 <%@page import="edu.cornell.mannlib.vitro.webapp.dao.jena.JenaBaseDao"%>
 <%@page import="java.io.InputStream"%>
 <%@page import="java.util.Properties"%>
-<%@page import="edu.cornell.mannlib.vedit.beans.LoginFormBean"%>
+<%@page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean"%>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.Controllers" %>
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
@@ -32,8 +32,7 @@
 %>
 
 <%
-
-	if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.DBA)) {
+	if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.DBA)) {
 	    %>
         <c:redirect url="<%= Controllers.LOGIN %>" />
         <%
diff --git a/webapp/web/admin/temporaryLogin.jsp b/webapp/web/admin/temporaryLogin.jsp
index e5f929bbc..452708716 100644
--- a/webapp/web/admin/temporaryLogin.jsp
+++ b/webapp/web/admin/temporaryLogin.jsp
@@ -1,6 +1,6 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
+<%@ page import="edu.cornell.mannlib.vedit.beans.LoginStatusBean" %>
 
 <%@ page import="com.hp.hpl.jena.rdf.model.*" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep" %>
@@ -11,7 +11,7 @@
 
 <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
 
-<%  if(session == null || !LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+<%  if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         %><c:redirect url="<%= Controllers.LOGIN %>" /><%
     }
 
@@ -22,7 +22,7 @@
         FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session );
         FakeSelfEditingIdentifierFactory.putFakeIdInSession( netid , session );
         // don't want to do this because would affect the whole session
-        // if(LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+        // if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         //	   CuratorEditingPolicySetup.removeAllCuratorEditingPolicies(getServletConfig().getServletContext());
         //} %>
         <jsp:forward page="/edit/login.jsp"/>                   
@@ -32,7 +32,7 @@
         VitroRequestPrep.forceOutOfSelfEditing(request);
         FakeSelfEditingIdentifierFactory.clearFakeIdInSession( session );        
      	// don't want to do this because would affect the whole session
-        // if(LoginFormBean.loggedIn(request, LoginFormBean.CURATOR)) {
+        // if (!LoginStatusBean.getBean(request).isLoggedInAtLeast(LoginStatusBean.CURATOR)) {
         //	   CuratorEditingPolicySetup.replaceCuratorEditing(getServletConfig().getServletContext(),(Model)application.getAttribute("jenaOntModel"));
         //}
         %><c:redirect url="/"></c:redirect><%
diff --git a/webapp/web/admin/testnetid.jsp b/webapp/web/admin/testnetid.jsp
index 58b2defa8..a8b542377 100644
--- a/webapp/web/admin/testnetid.jsp
+++ b/webapp/web/admin/testnetid.jsp
@@ -5,7 +5,6 @@
 <%@ page import="com.hp.hpl.jena.shared.Lock" %>
 <%@ page import="com.thoughtworks.xstream.XStream" %>
 <%@ page import="com.thoughtworks.xstream.io.xml.DomDriver" %>
-<%@ page import="edu.cornell.mannlib.vedit.beans.LoginFormBean" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.beans.Individual" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.VitroRequest" %>
 <%@ page import="edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory" %>