Only pass the password if non empty