Fixed secure token issue