diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
index 4537db358..552e91f3a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java
@@ -82,6 +82,14 @@ public class ModelAccess {
 		this.parent = parent;
 	}
 
+	public void setUserAccountsModel(OntModel m) {
+		setOntModel(ModelID.USER_ACCOUNTS, m);
+	}
+	
+	public OntModel getUserAccountsModel() {
+		return getOntModel(ModelID.USER_ACCOUNTS);
+	}
+	
 	public void setDisplayModel(OntModel m) {
 		setOntModel(ModelID.DISPLAY, m);
 	}
@@ -101,14 +109,6 @@ public class ModelAccess {
 	// "ModelAccess.getAssertionsOntModel not implemented.");
 	// }
 	//
-	// public void setUserAccountsModel(OntModel m) {
-	// setOntModel(ModelID.USER_ACCOUNTS, m);
-	// }
-	//
-	// public OntModel getUserAccountsModel() {
-	// return getOntModel(ModelID.USER_ACCOUNTS);
-	// }
-	//
 	// public OntModel getDisplayTboxOntModel() {
 	// throw new RuntimeException(
 	// "ModelAccess.getDisplayTboxOntModel not implemented.");
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
index 7fce186ef..ae2a3391f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java
@@ -71,7 +71,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase
 			JenaDataSourceSetupBase.thisIsFirstStartup();
 		}
 
-    	OntModel userAccountsModel = ontModelFromContextAttribute(ctx, "userAccountsOntModel");     
+    	OntModel userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel(); 
         OntModel displayModel = ModelAccess.on(ctx).getDisplayModel();
         OntModel baseABoxModel = createNamedModelFromDataset(dataset, JENA_DB_MODEL);
         OntModel inferenceABoxModel = createNamedModelFromDataset(dataset, JENA_INF_MODEL);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
index 3d1a54d6f..47b51a5a3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/UserModelSetup.java
@@ -6,7 +6,6 @@ import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.sql.DataSource;
 
-import org.apache.commons.dbcp.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -14,6 +13,7 @@ import com.hp.hpl.jena.ontology.OntModel;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelSynchronizer;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
@@ -65,7 +65,7 @@ public class UserModelSetup extends JenaDataSourceSetupBase
         	userAccountsModel.add(userAccountsDbModel);
             userAccountsModel.getBaseModel().register(
                     new ModelSynchronizer(userAccountsDbModel));
-            ctx.setAttribute("userAccountsOntModel", userAccountsModel);
+            ModelAccess.on(ctx).setUserAccountsModel(userAccountsModel);
                         
         } catch (Throwable t) {
             log.error("Unable to load user accounts model from DB", t);