[RJA-2739][fix] - Session timeout functionality is confusing