diff --git a/frontend/cypress/CustomFunctions/Login.ts b/frontend/cypress/CustomFunctions/Login.ts
index dba33d90aa..3d3c8f791a 100644
--- a/frontend/cypress/CustomFunctions/Login.ts
+++ b/frontend/cypress/CustomFunctions/Login.ts
@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 const Login = ({ email, name }: LoginProps): void => {
-	const emailInput = cy.findByPlaceholderText('mike@netflix.com');
+	const emailInput = cy.findByPlaceholderText('name@yourcompany.com');
 
 	emailInput.then((emailInput) => {
 		const element = emailInput[0];
@@ -13,7 +14,7 @@ const Login = ({ email, name }: LoginProps): void => {
 		expect(inputValue).to.be.equals(email);
 	});
 
-	const firstNameInput = cy.findByPlaceholderText('Mike');
+	const firstNameInput = cy.findByPlaceholderText('Your Name');
 	firstNameInput.then((firstNameInput) => {
 		const element = firstNameInput[0];
 		// element is present
diff --git a/frontend/src/container/Login/index.tsx b/frontend/src/container/Login/index.tsx
index ff24406a22..0705a5d2e9 100644
--- a/frontend/src/container/Login/index.tsx
+++ b/frontend/src/container/Login/index.tsx
@@ -61,7 +61,7 @@ function Login(): JSX.Element {
 				<ParentContainer>
 					<Label htmlFor="signupEmail">Email</Label>
 					<Input
-						placeholder="mike@netflix.com"
+						placeholder="name@yourcompany.com"
 						type="email"
 						autoFocus
 						required
diff --git a/frontend/src/container/MySettings/UpdateName/index.tsx b/frontend/src/container/MySettings/UpdateName/index.tsx
index bc42075b04..0b5fd501c7 100644
--- a/frontend/src/container/MySettings/UpdateName/index.tsx
+++ b/frontend/src/container/MySettings/UpdateName/index.tsx
@@ -72,7 +72,7 @@ function UpdateName(): JSX.Element {
 			<Space direction="vertical" size="middle">
 				<Typography>Name</Typography>
 				<NameInput
-					placeholder="Mike Tyson"
+					placeholder="Your Name"
 					onChange={(event): void => {
 						setChangedName(event.target.value);
 					}}
diff --git a/frontend/src/pages/SignUp/SignUp.tsx b/frontend/src/pages/SignUp/SignUp.tsx
index 9a3a967738..43278b76fb 100644
--- a/frontend/src/pages/SignUp/SignUp.tsx
+++ b/frontend/src/pages/SignUp/SignUp.tsx
@@ -186,7 +186,7 @@ function SignUp({ version }: SignUpProps): JSX.Element {
 					<div>
 						<Label htmlFor="signupEmail">Email</Label>
 						<Input
-							placeholder="mike@netflix.com"
+							placeholder="name@yourcompany.com"
 							type="email"
 							autoFocus
 							value={email}
@@ -199,6 +199,7 @@ function SignUp({ version }: SignUpProps): JSX.Element {
 						/>
 					</div>
 
+
 					{isNameVisible && (
 						<div>
 							<Label htmlFor="signupFirstName">First Name</Label>
@@ -215,10 +216,11 @@ function SignUp({ version }: SignUpProps): JSX.Element {
 						</div>
 					)}
 
+
 					<div>
 						<Label htmlFor="organizationName">Organization Name</Label>
 						<Input
-							placeholder="Netflix"
+							placeholder="Your Company"
 							value={organizationName}
 							onChange={(e): void => {
 								setState(e.target.value, setOrganizationName);
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 4790ab4740..1ac93ea555 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -29,6 +29,7 @@
 		"./.eslintrc.js",
 		"./__mocks__",
 		"./conf/default.conf",
-		"./public"
+		"./public",
+		"./cypress"
 	]
 }