Merge "Fix security vulnerability that creates user with no restrictions when accountOptions are too long." into main