Improving activate base on URL