Login Page: Empty password and username shoudn't validate

Current if I enter an empty password and empty user, the systems allows me to continue.
This works ok when you enter either a username or a pass.

This condition needs to be changed to and 'AND':
..
if (!empty($username) || !empty($password)) {
..
on commerce_extra_login_page_login_pane_checkout_form_validate