diff --git a/actions/challengeRegistration.js b/actions/challengeRegistration.js
index 149a40d96..0d558f628 100644
--- a/actions/challengeRegistration.js
+++ b/actions/challengeRegistration.js
@@ -404,7 +404,7 @@ var sendNotificationEmail = function (api, componentInfo, userId, activeForumCat
             if (challengeType === CHALLENGE_TYPE.DEVELOP) {
                 forumURL = api.config.tcConfig.developForumsUrlPrefix + activeForumCategoryId;
                 reviewURL = process.env.TC_SOFTWARE_SERVER_NAME + '/review/actions/ViewProjectDetails?pid=' + challengeId;
-                submitURL = process.env.TC_ACTIVATION_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/?type=develop';
+                submitURL = process.env.TC_WWW_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/?type=develop';
             } else if (challengeType === CHALLENGE_TYPE.DESIGN) {
                 forumURL = api.config.tcConfig.studioForumsUrlPrefix + activeForumCategoryId;
                 //submitURL = process.env.TC_STUDIO_SERVER_NAME + '/?module=ViewContestDetails&ct=' + challengeId;
diff --git a/actions/memberRegistration.js b/actions/memberRegistration.js
index cb75d89cf..789bcb61f 100644
--- a/actions/memberRegistration.js
+++ b/actions/memberRegistration.js
@@ -396,7 +396,7 @@ var registerUser = function (user, api, dbConnectionMap, next) {
                 },
 				function (callback) {
                     var url;
-                    url = process.env.TC_ACTIVATION_SERVER_NAME + '/reg2/activate.action?code=' + activationCode;
+                    url = process.env.TC_ACTIVATION_SERVER_NAME + '?code=' + activationCode + '&retUrl=https://www.topcoder.com/skill-picker';
                     if (user.regSource && user.regSource.match(/arena/)) {
                       url += '&destination=http%3A%2F%2Farena.topcoder.com';
                     }
diff --git a/actions/user.js b/actions/user.js
index 88bece40f..b8f7101f9 100644
--- a/actions/user.js
+++ b/actions/user.js
@@ -233,7 +233,7 @@ function userActivationEmail(api, connection, next) {
                     toAddress : rs[0].address,
                     fromAddress : process.env.TC_EMAIL_ACCOUNT,
                     senderName : activationEmailSenderName,
-                    url : process.env.TC_ACTIVATION_SERVER_NAME + '/reg2/activate.action?code=' + activationCode,
+                    url : process.env.TC_ACTIVATION_SERVER_NAME + '?code=' + activationCode + '&retUrl=https://www.topcoder.com/skill-picker',
                     userHandle : rs[0].handle
                 }, 'default');
             api.cache.save(cacheKey, currentResendTimes + 1, api.config.tcConfig.userActivationCacheLifeTime,
diff --git a/deploy/ci.sh b/deploy/ci.sh
index a0143cf31..e3cfb2f49 100644
--- a/deploy/ci.sh
+++ b/deploy/ci.sh
@@ -58,7 +58,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
 export TC_EMAIL_FROM=tc.ldap.test@gmail.com
 export TC_EMAIL_TEMPLATE_DIR=mail_templates
 
-export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
+export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
+export TC_WWW_SERVER_NAME="https://www.topcoder.com"
 export TC_SOFTWARE_SERVER_NAME="https://www.topcoder.com"
 
 #export DISABLE_CONSOLE_LOG=true
diff --git a/deploy/development.sh b/deploy/development.sh
index 11f08580c..7ec784d66 100755
--- a/deploy/development.sh
+++ b/deploy/development.sh
@@ -60,7 +60,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
 export TC_EMAIL_FROM=tc.ldap.test.1@gmail.com
 export TC_EMAIL_TEMPLATE_DIR=mail_templates
 
-export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
+export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
+export TC_WWW_SERVER_NAME="https://www.topcoder.com"
 export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
 export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"
 
diff --git a/deploy/vm.sh b/deploy/vm.sh
index 5f75cefe6..a193827d3 100644
--- a/deploy/vm.sh
+++ b/deploy/vm.sh
@@ -54,7 +54,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
 export TC_EMAIL_FROM=tc.ldap.test.1@gmail.com
 export TC_EMAIL_TEMPLATE_DIR=mail_templates
 
-export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
+export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
+export TC_WWW_SERVER_NAME="https://www.topcoder.com"
 export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
 export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"
 
diff --git a/initializers/.dataAccess.js.swp b/initializers/.dataAccess.js.swp
deleted file mode 100644
index 542d73f7e..000000000
Binary files a/initializers/.dataAccess.js.swp and /dev/null differ
diff --git a/initializers/v3client.js b/initializers/v3client.js
index 21db566dc..765fc2a0e 100644
--- a/initializers/v3client.js
+++ b/initializers/v3client.js
@@ -87,6 +87,7 @@ function getToken(connection, callback) {
     });
 }
 
+
 function urlBase64Decode(str) {
     var output = str.replace(/-/g, '+').replace(/_/g, '/');
 
@@ -148,7 +149,6 @@ function isTokenExpired(token) {
     return !(d.valueOf() > (new Date().valueOf()))
 }
 
-
 /**
  * Get IDs of users in the specified group
  *
diff --git a/local/env.sh b/local/env.sh
index ac4e6ab9c..2c2556c28 100644
--- a/local/env.sh
+++ b/local/env.sh
@@ -58,7 +58,8 @@ export TC_EMAIL_PASSWORD=tc_public_email
 export TC_EMAIL_FROM=tc.ldap.test.1@gmail.com
 export TC_EMAIL_TEMPLATE_DIR=mail_templates
 
-export TC_ACTIVATION_SERVER_NAME="https://www.topcoder.com"
+export TC_ACTIVATION_SERVER_NAME="https://api.topcoder.com/pub/activation.html"
+export TC_WWW_SERVER_NAME="https://www.topcoder.com"
 export TC_SOFTWARE_SERVER_NAME="https://software.topcoder.com"
 export TC_FORUMS_SERVER_NAME="http://apps.topcoder.com/forums"