diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FakeSelfEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FakeSelfEditController.java
index 0a852112b..861c39f98 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FakeSelfEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/FakeSelfEditController.java
@@ -39,8 +39,11 @@ public class FakeSelfEditController extends VitroHttpServlet {
 				// Logged in as site admin: Form to use netid
 				VitroRequestPrep.forceToSelfEditing(request);
 				String id = request.getParameter("netid");
-				FakeSelfEditingIdentifierFactory.clearFakeIdInSession(session);
 				FakeSelfEditingIdentifierFactory.putFakeIdInSession(id, session);
+
+				// Remove the login bean - so we are ONLY self-editing
+				session.removeAttribute("loginHandler");
+				
 				response.sendRedirect(request.getContextPath()
 						+ Controllers.ENTITY + "?netid=" + id);
 			} else if (request.getParameter("stopfaking") != null) {