Fix remaining issues in UserPermissionAddForm