diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c4271f469..fecc339bd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -319,7 +319,7 @@ jobs:
             Profile_View_CMS_User_Denied.spec.feature,
             Profile_View_CMS_User_Revoked.spec.feature,
             Profile_View_Helpdesk_User.spec.feature,
-            Profile_View_Mixed_Case_Emails.spec.feature,
+            Profile_View_Remove_Email_From_URL.spec.feature,
             Profile_View_State_Submitter.spec.feature,
             Profile_View_State_System_Admin.spec.feature,
             Request_A_Role_Change_As_CMS_Read_Only.spec.feature,
diff --git a/tests/cypress/cypress/e2e/Profile_View_Mixed_Case_Emails.spec.feature b/tests/cypress/cypress/e2e/Profile_View_Mixed_Case_Emails.spec.feature
deleted file mode 100644
index 7c2de541f..000000000
--- a/tests/cypress/cypress/e2e/Profile_View_Mixed_Case_Emails.spec.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-Feature: OY2-11159 Case sensitive emails causing login error
-    Scenario: Verify user is able to login with all lowercase and manipulate url for email to mixedcase and all uppercase characters
-        Given I am on Login Page
-        When Clicking on Development Login
-        When Login with "an Active" "State Submitter" user
-        Then i am on Dashboard Page
-        Then navigate to "/profile/statesubmitter@nightwatch.test"
-        Then Actual Full Name is Displayed
-        Then navigate to "/profile/STATESUBMITTER@NIGHTWATCH.TEST"
-        Then Actual Full Name is Displayed
-        Then navigate to "/profile/staTEsubmiTTeR@nightwatch.test"
-        Then Actual Full Name is Displayed
\ No newline at end of file
diff --git a/tests/cypress/cypress/e2e/Profile_View_Remove_Email_From_URL.spec.feature b/tests/cypress/cypress/e2e/Profile_View_Remove_Email_From_URL.spec.feature
new file mode 100644
index 000000000..52ea60be3
--- /dev/null
+++ b/tests/cypress/cypress/e2e/Profile_View_Remove_Email_From_URL.spec.feature
@@ -0,0 +1,15 @@
+Feature: Encode profile urls
+    Scenario: Verify entering email in profile url shows page not found
+        Given I am on Login Page
+        When Clicking on Development Login
+        When Login with "an Active" "State Submitter" user
+        Then i am on Dashboard Page
+        Then navigate to "/profile/statesubmitter@nightwatch.test"
+        Then verify the dashboard says Sorry, page not found!
+        Then verify page url contains 'notfound'
+        Then navigate to "/profile/STATESUBMITTER@NIGHTWATCH.TEST"
+        Then verify the dashboard says Sorry, page not found!
+        Then verify page url contains 'notfound'
+        Then navigate to "/profile/staTEsubmiTTeR@nightwatch.test"
+        Then verify the dashboard says Sorry, page not found!
+        Then verify page url contains 'notfound'
\ No newline at end of file
diff --git a/tests/cypress/cypress/e2e/common/steps.js b/tests/cypress/cypress/e2e/common/steps.js
index 11a79777a..e79689fb5 100644
--- a/tests/cypress/cypress/e2e/common/steps.js
+++ b/tests/cypress/cypress/e2e/common/steps.js
@@ -883,6 +883,9 @@ Then(
 Then("verify Error message displayed should be No Results Found", () => {
   OneMacDashboardPage.noResultsFoundErrorMessage();
 });
+Then("verify the dashboard says Sorry, page not found!", () => {
+  OneMacDashboardPage.verifySorryPageNotFoundMessage();
+});
 Then("verify user exists with id number searched", () => {
   cy.fixture("packageDashboardWaiverNumbers.json").then((data) => {
     OneMacDashboardPage.verifyIDNumberExists(data.newInitialWaiverNumber2);
diff --git a/tests/cypress/support/pages/oneMacDashboardPage.js b/tests/cypress/support/pages/oneMacDashboardPage.js
index e4860c9e6..fd7c4f776 100644
--- a/tests/cypress/support/pages/oneMacDashboardPage.js
+++ b/tests/cypress/support/pages/oneMacDashboardPage.js
@@ -348,6 +348,10 @@ export class oneMacDashboardPage {
     cy.xpath(noResultsFound).contains("No Results Found");
   }
 
+  verifySorryPageNotFoundMessage() {
+    cy.get("h3").contains("Sorry, page not found!");
+  }
+
   typeCreatedIDNumber(s) {
     cy.get(searchbar).type(s);
   }