modified:   includes/class.users.php
	modified:   includes/class.users.php~
	modified:   login-actions.php
	modified:   login-actions.php~