added more checking on the login information
Merge branch 'master' of https://github.com/PhoenixRockit/3rd-degree