Changes to use user stored in the custom sesson.
Update to use the custom Session