Cleaned up login/out dialogs
Changed to V2.1.1