fix - allow token or password based login

Brings code into compliance with documentation which says you can log in with a password, then remove it after a token is saved in the gv.conf file.