diff --git a/actions/challengeRegistration.js b/actions/challengeRegistration.js
index 242173025..e9ac4260d 100644
--- a/actions/challengeRegistration.js
+++ b/actions/challengeRegistration.js
@@ -382,7 +382,8 @@ var sendNotificationEmail = function (api, componentInfo, userId, activeForumCat
             documentationDetails = '';
             // we need to set up a new environment variable for the web server name specifici to each environment
             //submitURL = process.env.TC_ACTIVATION_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/';
-            submitURL = 'https://www.topcoder.com/challenges/' + challengeId + '/submit/file/';
+            // Set the default submission URL.
+            submitURL = process.env.TC_ACTIVATION_SERVER_NAME + '/challenges/' + challengeId + '/submit/file/';
 
             reviewURL = process.env.TC_SOFTWARE_SERVER_NAME + '/review';
 
@@ -400,9 +401,11 @@ 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 + '/challenges/' + challengeId + '/submit/file/';
             } else if (challengeType === CHALLENGE_TYPE.DESIGN) {
                 forumURL = api.config.tcConfig.studioForumsUrlPrefix + activeForumCategoryId;
-                submitURL = process.env.TC_STUDIO_SERVER_NAME + '/?module=ViewContestDetails&ct=' + challengeId;
+                //submitURL = process.env.TC_STUDIO_SERVER_NAME + '/?module=ViewContestDetails&ct=' + challengeId;
+                submitURL = process.env.TC_ACTIVATION_SERVER_NAME + '/challenge-details/' + challengeId + '/submit/?type=develop';
             }
             
             if (componentInfo.review_type && componentInfo.review_type == 'PEER')