Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2946 -r3013
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2946)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 3013)
@@ -128,7 +128,7 @@
 			
 			$object =& $event->getObject();
 			
-			if( $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->Fields['State']['required'] = true;
+			if( $object->isRequired('Country') && $cs_helper->CountryHasStates( $object->GetDBField('Country') ) ) $object->setRequired('State', true);
 			$object->setLogin();
 		}