Better handling of non-premium accounts