Changed some behavior of AuthToken