Better handling passwordless case