Change: Add warden and fix logout