Use session user in a couple more locations