Improve handling of wrong Login call