Moving token setting to arguments and filtering password field