Added logout and login failure message
Resolved conflict