Use Principal instead of just User, which allows us to add groups as well.

Some localization too.