diff --git a/upload/member.php b/upload/member.php
index ee7282e8db114581844fec5a0aab2f17f7c36736..d0c2869bda42c62f3ed2ffb48f4af6a11443f078 100644
--- a/upload/member.php
+++ b/upload/member.php
@@ -14,7 +14,7 @@ require './source/class/class_core.php';
 
 $discuz = C::app();
 
-$modarray = array('activate', 'emailverify', 'getpasswd',
+$modarray = array('getpasswd',
 	'groupexpiry', 'logging', 'lostpasswd',
 	'register', 'regverify', 'switchstatus');
 
diff --git a/upload/source/class/class_member.php b/upload/source/class/class_member.php
index 3d148815abee519ed5bfffe4480b0b5023d8cfc9..d68d3d9d6318df12e6ff0834ce8915558f4f753f 100644
--- a/upload/source/class/class_member.php
+++ b/upload/source/class/class_member.php
@@ -890,19 +890,9 @@ class register_ctl {
 			$refreshtime = 3000;
 			switch($this->setting['regverify']) {
 				case 1:
-					$idstring = random(6);
-					$authstr = $this->setting['regverify'] == 1 ? "$_G[timestamp]\t2\t$idstring" : '';
-					C::t('common_member_field_forum')->update($_G['uid'], array('authstr' => $authstr));
-					$verifyurl = $_G['setting']['securesiteurl']."member.php?mod=activate&uid={$_G[uid]}&id=$idstring";
-					$email_verify_message = lang('email', 'email_verify_message', array(
-						'username' => $_G['member']['username'],
-						'bbname' => $this->setting['bbname'],
-						'siteurl' => $_G['setting']['securesiteurl'],
-						'url' => $verifyurl
-					));
-					if(!sendmail("$username <$email>", lang('email', 'email_verify_subject'), $email_verify_message)) {
-						runlog('sendmail', "$email sendmail failed.");
-					}
+					require_once libfile('function/spacecp');
+					emailcheck_send($_G['uid'], $email);
+					dsetcookie('resendemail', TIMESTAMP);
 					$message = 'register_email_verify';
 					$locationmessage = 'register_email_verify_location';
 					$refreshtime = 10000;
diff --git a/upload/source/module/member/member_activate.php b/upload/source/module/member/member_activate.php
deleted file mode 100644
index cc393f6b0e9e396d3a4188f1231a45bbb5a70476..0000000000000000000000000000000000000000
--- a/upload/source/module/member/member_activate.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- *      [Discuz!] (C)2001-2099 Comsenz Inc.
- *      This is NOT a freeware, use is subject to license terms
- *
- *      $Id: member_activate.php 25756 2011-11-22 02:47:45Z zhangguosheng $
- */
-
-if(!defined('IN_DISCUZ')) {
-	exit('Access Denied');
-}
-
-define('NOROBOT', TRUE);
-
-$paramexist = preg_match_all('/(\?|&(amp)?(;)?)(.+?)=([^&?]*)/i', $_SERVER['QUERY_STRING'], $parammatchs);
-if($paramexist){
-	foreach($parammatchs[5] as $paramk => $paramv){
-		$param[$parammatchs[4][$paramk]] = $paramv;
-	}
-}
-$uid = isset($_GET['uid']) ? $_GET['uid'] : $param['uid'];
-$id = isset($_GET['id']) ? $_GET['id'] : $param['id'];
-
-if($uid && $id) {
-
-	$member = getuserbyuid($uid);
-	if($member && $member['groupid'] == 8) {
-		$member = array_merge(C::t('common_member_field_forum')->fetch($member['uid']), $member);
-	} else {
-		showmessage('activate_illegal', 'index.php');
-	}
-	list($dateline, $operation, $idstring) = explode("\t", $member['authstr']);
-
-	if($operation == 2 && $idstring == $id) {
-		$newgroup = C::t('common_usergroup')->fetch_by_credits($member['credits']);
-		C::t('common_member')->update($member['uid'], array('groupid' => $newgroup['groupid'], 'emailstatus' => '1'));
-		C::t('common_member_field_forum')->update($member['uid'], array('authstr' => ''));
-		showmessage('activate_succeed', 'index.php', array('username' => $member['username']));
-	} else {
-		showmessage('activate_illegal', 'index.php');
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/source/module/member/member_emailverify.php b/upload/source/module/member/member_emailverify.php
deleted file mode 100644
index 1cc9ed2b6b8cc0e9bc34b547e686cd0918cfda3f..0000000000000000000000000000000000000000
--- a/upload/source/module/member/member_emailverify.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- *      [Discuz!] (C)2001-2099 Comsenz Inc.
- *      This is NOT a freeware, use is subject to license terms
- *
- *      $Id: member_emailverify.php 25756 2011-11-22 02:47:45Z zhangguosheng $
- */
-
-if(!defined('IN_DISCUZ')) {
-	exit('Access Denied');
-}
-
-define('NOROBOT', TRUE);
-
-$member = getuserbyuid($_G['uid']);
-if(!$member || $member['groupid'] != 8) {
-	showmessage('member_not_found');
-} else {
-	$member = array_merge(C::t('common_member_field_forum')->fetch($member['uid']), $member);
-}
-
-if($_G['setting']['regverify'] == 2) {
-	showmessage('register_verify_invalid');
-}
-
-list($dateline, $type, $idstring) = explode("\t", $member['authstr']);
-if($type == 2 && TIMESTAMP - $dateline < 86400) {
-	showmessage('email_verify_invalid');
-}
-
-$idstring = $type == 2 && $idstring ? $idstring : random(6);
-C::t('common_member_field_forum')->update($_G['uid'], array('authstr'=>"$_G[timestamp]\t2\t$idstring"));
-$verifyurl = $_G['setting']['securesiteurl']."member.php?mod=activate&amp;uid={$_G[uid]}&amp;id=$idstring";
-$email_verify_message = lang('email', 'email_verify_message', array(
-	'username' => $_G['member']['username'],
-	'bbname' => $_G['setting']['bbname'],
-	'siteurl' => $_G['setting']['securesiteurl'],
-	'url' => $verifyurl
-));
-include_once libfile('function/mail');
-if(!sendmail("{$_G[member][username]} <$_GET[email]>", lang('email', 'email_verify_subject'), $email_verify_message)) {
-	runlog('sendmail', "$_GET[email] sendmail failed.");
-}
-showmessage('email_verify_succeed');
-
-?>
\ No newline at end of file