Fixed to accept empty username and password