fixed some references to static current user. use SessionManager instead