Removed hack to account, fixed account urls