diff --git a/library/config.php b/library/config.php
index b7d9e8289..7592a7ad4 100644
--- a/library/config.php
+++ b/library/config.php
@@ -33,7 +33,7 @@
  * Email
  * Debug
  * Special users (dbg_users, unlimited_users, super_admins)
- * LOG
+ * Log options
  * Error reporting
  * Triggers
  * Date format
@@ -367,7 +367,7 @@ $bb_cfg['invalid_logins']          = 5;            // Количество не
 $bb_cfg['new_user_reg_disabled']   = false;        // Запретить регистрацию новых учетных записей
 $bb_cfg['unique_ip']               = false;        // Запретить регистрацию нескольких учетных записей с одного ip
 $bb_cfg['new_user_reg_restricted'] = false;        // Ограничить регистрацию новых пользователей по времени с 01:00 до 17:00
-$bb_cfg['reg_email_activation']    = false;        // Требовать активацию учетной записи по email
+$bb_cfg['reg_email_activation']    = true;         // Требовать активацию учетной записи по email
 
 // Email
 $bb_cfg['emailer_disabled']        = false;
@@ -426,22 +426,6 @@ define('LOG_SEPR',     ' | ');
 define('LOG_LF',       "\n");
 define('LOG_MAX_SIZE', 1048576); // bytes
 
-// Log request
-$log_ip_req = array(
-#	'127.0.0.1' => 'user1',  // CLIENT_IP => 'name'
-#	'7f000001'  => 'user2',  // USER_IP   => 'name'
-);
-
-$log_passkey = array(
-#	'passkey' => 'log_filename',
-);
-
-// Log response
-$log_ip_resp = array(
-#	'127.0.0.1' => 'user1',  // CLIENT_IP => 'name'
-#	'7f000001'  => 'user2',  // USER_IP   => 'name'
-);
-
 // Error reporting
 ini_set('error_reporting', E_ALL);
 ini_set('display_errors',  0);
diff --git a/library/includes/page_footer.php b/library/includes/page_footer.php
index 238a61c61..cb286084c 100644
--- a/library/includes/page_footer.php
+++ b/library/includes/page_footer.php
@@ -78,17 +78,6 @@ if (DBG_USER && SQL_DEBUG && !(isset($_GET['pane']) && $_GET['pane'] == 'left'))
 	require(INC_DIR . 'page_footer_dev.php');
 }
 
-##### LOG #####
-global $log_ip_resp;
-
-if (isset($log_ip_resp[USER_IP]) || isset($log_ip_resp[CLIENT_IP]))
-{
-	$str = date('H:i:s') . LOG_SEPR . preg_replace("#\s+#", ' ', $contents) . LOG_LF;
-	$file = 'sessions/'. date('m-d') .'_{'. USER_IP .'}_'. CLIENT_IP .'_resp';
-	bb_log($str, $file);
-}
-### LOG END ###
-
 echo '
 	</body>
 	</html>
diff --git a/library/includes/sessions.php b/library/includes/sessions.php
index 1fba89199..d0e1c75d9 100644
--- a/library/includes/sessions.php
+++ b/library/includes/sessions.php
@@ -131,25 +131,6 @@ class user_common
 			}
 		}
 
-		##### LOG #####
-		global $log_ip_req;
-
-		if (isset($log_ip_req[USER_IP]) || isset($log_ip_req[CLIENT_IP]))
-		{
-			$file = 'sessions/'. date('m-d') .'_{'. USER_IP .'}_'. CLIENT_IP;
-			$str = array();
-			$str[] = date('H:i:s');
-			$str[] = (@$this->sessiondata['uid']) ? sprintf('%06d', strval($this->sessiondata['uid'])) : 'guest ';
-			$str[] = (@$this->data['session_start']) ? gmdate('H:i:s', $this->data['session_start']) : 'guest   ';
-			$str[] = (@$this->sessiondata['sid']) ? sprintf('%-12s', strval($this->sessiondata['sid'])) : 'none        ';
-			$str[] = $_SERVER['REQUEST_URI'];
-		#	$str[] = 'REFERER: '. $_SERVER['HTTP_REFERER'];
-			$str[] = @$_SERVER['HTTP_USER_AGENT'];
-			$str = join(LOG_SEPR, $str) . LOG_LF;
-			bb_log($str, $file);
-		}
-		### LOG END ###
-
 		// Did the session exist in the DB?
 		if ($this->data)
 		{
diff --git a/library/includes/ucp/register.php b/library/includes/ucp/register.php
index 89f513371..35983886c 100644
--- a/library/includes/ucp/register.php
+++ b/library/includes/ucp/register.php
@@ -653,7 +653,7 @@ if ($submit && !$errors)
 			$emailer = new emailer($bb_cfg['smtp_delivery']);
 
 			$emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>");
-			$emailer->email_address($username . "<" . $db_data['user_email'] . ">");
+			$emailer->email_address($username ." <{$email}>");
 
 			$emailer->use_template($email_template, $user_lang);
 
@@ -691,9 +691,10 @@ if ($submit && !$errors)
 				require(CLASS_DIR .'emailer.php');
 				$emailer = new emailer($bb_cfg['smtp_delivery']);
 
- 				$emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>");
+				$emailer->from($bb_cfg['sitename'] ." <{$bb_cfg['board_email']}>");
+				$emailer->email_address($username ." <{$email}>");
+
 				$emailer->use_template('user_activate', $pr_data['user_lang']);
-				$emailer->email_address($username . "<" . $pr_data['user_email'] . ">");
 
 				$emailer->assign_vars(array(
 					'SITENAME'   => $bb_cfg['sitename'],
@@ -726,11 +727,11 @@ if ($submit && !$errors)
 
 			cache_rm_user_sessions ($pr_data['user_id']);
 
-			if($adm_edit)
+			if ($adm_edit)
 			{
 				bb_die($lang['PROFILE_USER'] . ' <b>'. profile_url($pr_data) .'</b> '. $lang['GOOD_UPDATE']);
 			}
-			elseif(!$pr_data['user_active'])
+			elseif (!$pr_data['user_active'])
 			{
 				bb_die($lang['PROFILE_UPDATED_INACTIVE']);
 			}