change url rules for account, other small tuning