Removed restrictions on account id