Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php	(revision 14433)
+++ units/users/users_event_handler.php	(working copy)
@@ -519,10 +519,9 @@
 			if (!$this->isSubscriberOnly($event, true)) {
 				$cs_helper->CheckStateField($event, 'State', 'Country');
 			}
-			else {
-				// no need to make password required when guest user tries to subscribe to mailing
-				$this->_makePasswordRequired($event);
-			}
+
+			$this->_makePasswordRequired($event);
+
 			$cs_helper->PopulateStates($event, 'State', 'Country');
 
 			$object =& $event->getObject();
@@ -722,14 +721,13 @@
 					}
 				}
 				else {
-					$object->SetField('Email', $user_email);
-					$object->SetField('Login', $user_email);
-					$object->SetDBField('dob', 1);
-					$object->SetDBField('dob_date', 1);
-					$object->SetDBField('dob_time', 1);
+					$password = makepassword4();
+			      	$object->SetField('Password', $password);
+			      	$object->SetField('VerifyPassword', $password);
+					$object->SetDBField('Email', $user_email);
+					$object->SetDBField('Login', $user_email);
 					$object->SetDBField('Status', STATUS_ACTIVE); // make user subscriber Active by default
-					$ip = getenv('HTTP_X_FORWARDED_FOR')?getenv('HTTP_X_FORWARDED_FOR'):getenv('REMOTE_ADDR');
-					$object->SetDBField('ip', $ip);
+					$object->SetDBField('ip', $_SERVER['REMOTE_ADDR']);
 
 					$this->Application->SetVar('IsSubscriber', 1);