fixed login entry and connection failure message
Fixed entry and connection error prompt
Merge branch 'master' of github.com:FFAxKenny/CA-Desktop