Fix empty username/password bug