Login procedure improved

The login procedure has been improved and has become faster. It turned out there was still a bug in it, and that has now been fixed,