diff --git a/app/topcoder.routes.js b/app/topcoder.routes.js
index 8e75ff1ff..bdeaef130 100644
--- a/app/topcoder.routes.js
+++ b/app/topcoder.routes.js
@@ -28,7 +28,7 @@ import moment from 'moment'
       if (path.indexOf('?') > -1) {
         return path.replace('?', '/?')
       }
-      return path + '/'
+      $location.replace().path(path + '/')
     })
 
     var states = {
diff --git a/webpack.config.js b/webpack.config.js
index 3933f5967..9160c5b6f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,9 +16,14 @@ if (CI === 'master') {
   process.env.NODE_ENV = 'development'
 }
 
-
-process.env.CONNECTOR_URL = `https://accounts.${process.env.DOMAIN}/connector.html`
-process.env.ACCOUNTS_APP_URL = `https://accounts.${process.env.DOMAIN}/tc`
+var accountsAppURL = null
+if (process.env.ACCOUNTS_APP_URL) {
+  accountsAppURL = process.env.ACCOUNTS_APP_URL
+}
+var accountsConnectorURL = null
+if (process.env.ACCOUNTS_APP_CONNECTOR_URL) {
+  accountsConnectorURL = process.env.ACCOUNTS_APP_CONNECTOR_URL
+}
 
 const config = require('appirio-tech-webpack-config')({
   dirname: __dirname,
@@ -34,4 +39,11 @@ const config = require('appirio-tech-webpack-config')({
 
 if (CI) config.output.publicPath = process.env.ASSET_PREFIX
 
+if (accountsAppURL) {
+  process.env.ACCOUNTS_APP_URL = accountsAppURL
+}
+if (accountsConnectorURL) {
+  process.env.ACCOUNTS_APP_CONNECTOR_URL = accountsConnectorURL
+}
+
 module.exports = config