These too
Fix stuff

Add validation again too
Merge branch '2.3/develop' of github.com:pyrocms/pyrocms into 2.3/develop

Conflicts:
	system/cms/modules/users/events.php