Fixes for model changes
Auto Logoff