changed handling of login token