Fix for #3

 - Better login detection