Session expiration issues

Other Brookshire's issues: