require identity must happen before you get the identity role, fixes fatal error when session expires
fixed merge conflicts