Fixed wizard error when setting external AD mode
Merge branch 'jag/users-wizard-fix' into 3.2

Conflicts:
	main/users/ChangeLog