diff --git a/.circleci/config.yml b/.circleci/config.yml
index 832d6f80cd..00478163dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -248,7 +248,7 @@ jobs:
             source buildenvvar
             ./automated-smoke-test/smoketest.sh automation-config-staging.json prod
       - store_artifacts:
-          path: /automated-smoke-test/test-results
+          path: ./automated-smoke-test/test-results
   
    # Automated Smoke Testing against Production
   Smoke-Testing-On-Production:
@@ -273,6 +273,8 @@ jobs:
             source awsenvconf
             source buildenvvar
             ./automated-smoke-test/smoketest.sh automation-config-prod.json prod
+      - store_artifacts:
+          path: ./automated-smoke-test/test-results
 
   # Test job for the cases when we do not need deployment. It just rapidly
   # installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
diff --git a/automated-smoke-test/conf.ts b/automated-smoke-test/conf.ts
index c283b6375b..bc3828dc63 100644
--- a/automated-smoke-test/conf.ts
+++ b/automated-smoke-test/conf.ts
@@ -34,7 +34,7 @@ exports.config = {
   framework: 'jasmine2',
 
   specs: [
-    // '../temp/test-suites/tc-login.spec.js'
+    '../temp/test-suites/tc-login.spec.js',
     // '../temp/test-suites/tc-tools.spec.js',
     // '../temp/test-suites/tc-account.spec.js',
     // '../temp/test-suites/tc-profile.spec.js',
diff --git a/automated-smoke-test/page-objects/pages/topcoder/login/login.constants.ts b/automated-smoke-test/page-objects/pages/topcoder/login/login.constants.ts
index d32e496d7d..6f1b184993 100644
--- a/automated-smoke-test/page-objects/pages/topcoder/login/login.constants.ts
+++ b/automated-smoke-test/page-objects/pages/topcoder/login/login.constants.ts
@@ -5,9 +5,9 @@ export class LoginPageConstants {
   static get errors() {
     return {
       InvalidPassword:
-        'That password is incorrect. Please check that you entered the right one.',
+        'WRONG USERNAME OR PASSWORD.',
       MemberNotPresent:
-        "We couldn't find a member with that username. Please check that you entered it correctly.",
+        "WRONG USERNAME OR PASSWORD.",
     };
   }
 }
diff --git a/automated-smoke-test/page-objects/pages/topcoder/login/login.helper.ts b/automated-smoke-test/page-objects/pages/topcoder/login/login.helper.ts
index f8ca773ee8..1f3dca2921 100644
--- a/automated-smoke-test/page-objects/pages/topcoder/login/login.helper.ts
+++ b/automated-smoke-test/page-objects/pages/topcoder/login/login.helper.ts
@@ -48,7 +48,7 @@ export class LoginPageHelper {
    * @param {String} password
    */
   public static async verifyLogin(username: string, password: string) {
-    await CommonHelper.verifyCurrentUrl(ConfigHelper.getLoginUrl());
+    await CommonHelper.verifyCurrentUrlToContain(ConfigHelper.getLoginUrl());
     await this.loginPageObject.waitForLoginForm();
     await this.loginPageObject.fillLoginForm(username, password);
     const homePage = await this.loginPageObject.waitForHomePage();
diff --git a/automated-smoke-test/page-objects/pages/topcoder/login/login.po.ts b/automated-smoke-test/page-objects/pages/topcoder/login/login.po.ts
index 39ca7685a9..89fa24f91d 100644
--- a/automated-smoke-test/page-objects/pages/topcoder/login/login.po.ts
+++ b/automated-smoke-test/page-objects/pages/topcoder/login/login.po.ts
@@ -48,7 +48,7 @@ export class LoginPage {
    * Get Error message
    */
   public get errorMessage() {
-    return ElementHelper.getElementByClassName('form-error');
+    return ElementHelper.getElementByCss('.auth0-global-message.auth0-global-message-error .animated.fadeInUp span');
   }
 
   /**
diff --git a/automated-smoke-test/test-suites/tc-login.spec.ts b/automated-smoke-test/test-suites/tc-login.spec.ts
index 30c3c941ae..001c2b43b2 100644
--- a/automated-smoke-test/test-suites/tc-login.spec.ts
+++ b/automated-smoke-test/test-suites/tc-login.spec.ts
@@ -32,11 +32,11 @@ describe('Topcoder Login Page Tests: ', () => {
    * Verifies User cannot login using invalid username
    */
   it('[TC_002] should Verify User cannot login using invalid username', async () => {
-    const invalidUsername = testData.login.invalidUsername;
+    const { invalidUsername } = testData.login;
     const password = ConfigHelper.getPassword();
     await LoginPageHelper.verifyLoginWithInvalidUserName(
       invalidUsername,
-      password
+      password,
     );
   });
 
@@ -45,10 +45,10 @@ describe('Topcoder Login Page Tests: ', () => {
    */
   it('[TC_003] should Verify User cannot login using invalid password', async () => {
     const username = ConfigHelper.getUserName();
-    const inavlidPassword = testData.login.invalidPassword;
+    const { invalidPassword } = testData.login;
     await LoginPageHelper.verifyLoginWithInvalidPassword(
       username,
-      inavlidPassword
+      invalidPassword,
     );
   });