CORE-5716: Small code cleanup
CORE-5716: User session not restored until after error ack'd