Also fix clobber of password reset user ID's in config table, and fix
cleanup of client password reset tokens from config table.

Also fixup some layout issues in filter management

Conflicts:
	include/class.forms.php