Make it work also if we use a bind account