diff --git a/src/app/shared/shared_modules/public-key/public-key.component.html b/src/app/shared/shared_modules/public-key/public-key.component.html
index ed47aa886c..e1b468ed55 100644
--- a/src/app/shared/shared_modules/public-key/public-key.component.html
+++ b/src/app/shared/shared_modules/public-key/public-key.component.html
@@ -177,13 +177,13 @@ <h4 class="modal-title">Change public key</h4>
 					<strong>Info: </strong> Please enter a valid public key!
 				</alert>
 
-				<alert type="success" *ngIf="(this.public_key | isValidKeyPipe) && validated_key">
+				<alert type="success" *ngIf="(public_key | isValidKeyPipe) && validated_key">
 					<strong>Info: </strong> This is a valid public key!
 				</alert>
-				<alert type="danger" *ngIf="(!(this.public_key | isValidKeyPipe) || !validated_key) && public_key?.length > 0">
+				<alert type="danger" *ngIf="(!(public_key | isValidKeyPipe) || !validated_key) && public_key?.length > 0">
 					<strong>Warning</strong> This is not a valid public key!
 				</alert>
-				<alert type="danger" *ngIf="(!(this.public_key | isValidKeyPipe) || blocked_key) && validated_key">
+				<alert type="danger" *ngIf="(!(public_key | isValidKeyPipe) || blocked_key) && validated_key">
 					<strong>Warning: </strong>Due to security concerns, your key has been blocked permanently, and you won't be
 					able to use it anymore. It's highly recommended that you change your key immediately to prevent any further
 					security breaches.
@@ -214,7 +214,7 @@ <h4 class="modal-title">Change public key</h4>
 
 				<div
 					class="alert"
-					*ngIf="(this.public_key | isValidKeyPipe) && validated_key && !blocked_key"
+					*ngIf="(public_key | isValidKeyPipe) && validated_key && !blocked_key"
 					[ngClass]="acknowledgement_given ? 'alert-info' : 'alert-danger'"
 				>
 					<strong>Warning!</strong> Replacing your current public key with a different one will render all your
@@ -222,14 +222,14 @@ <h4 class="modal-title">Change public key</h4>
 					<div class="form-check">
 						<input
 							class="form-check-input"
-							name="public_key_acknowledgement_checkbox"
+							name="public_key_acknowledgement_checkbox_replace"
 							type="checkbox"
 							[ngClass]="acknowledgement_given ? '' : 'is-invalid'"
-							id="public_key_acknowledgement_checkbox"
-							data-test-id="public_key_acknowledgement_checkbox"
+							id="public_key_acknowledgement_checkbox_replace"
+							data-test-id="public_key_acknowledgement_checkbox_replace"
 							[(ngModel)]="acknowledgement_given"
 						/>
-						<label class="form-check-label" for="public_key_acknowledgement_checkbox">
+						<label class="form-check-label" for="public_key_acknowledgement_checkbox_replace">
 							I hereby confirm that I am aware of the effects of entering a new SSH-key.
 						</label>
 					</div>
@@ -238,7 +238,7 @@ <h4 class="modal-title">Change public key</h4>
 
 			<div class="modal-footer">
 				<button
-					[disabled]="!(this.public_key | isValidKeyPipe) || !validated_key || !acknowledgement_given || blocked_key"
+					[disabled]="!(public_key | isValidKeyPipe) || !validated_key || !acknowledgement_given || blocked_key"
 					class="btn btn-success col-md4"
 					type="button"
 					id="set_new_public_key_button"
@@ -286,7 +286,7 @@ <h4 class="modal-title">Setting of public key of public key</h4>
 					type="button"
 					id="close_new_public_key_response_modal_button"
 					data-test-id="close_new_public_key_response_modal_button"
-					(click)="this.pubKeyResponseModal.hide()"
+					(click)="pubKeyResponseModal.hide()"
 				>
 					OK
 				</button>
diff --git a/tests/page_objects/profile.po.ts b/tests/page_objects/profile.po.ts
index 9f81a8b2ba..9042a35d54 100644
--- a/tests/page_objects/profile.po.ts
+++ b/tests/page_objects/profile.po.ts
@@ -66,7 +66,9 @@ export class ProfilePage {
 		await this.page.fill(Util.by_data_test_id_str(this.ENTER_PUBLIC_KEY_AREA), this.TEST_PUBLIC_KEY);
 		console.log('Confirming effects of generating a new Key');
 
-		await this.page.locator(Util.by_data_test_id_str(this.PUBLIC_KEY_ACKNOWLEDGE_CHECKBOX)).last().click()
+		await this.page.locator(Util.by_data_test_id_str("public_key_acknowledgement_checkbox_replace")).click();
+		await this.page.locator(Util.by_data_test_id_str("public_key_acknowledgement_checkbox_replace")).click();
+
 		//	await this.page.locator(Util.by_data_test_id_str(this.GENERATE_KEY_CHECKBOX)).click();
 		console.log('Clicking on Set-Button');
 		await Promise.all([
diff --git a/tests/util.ts b/tests/util.ts
index aafb630eb1..249848b1b4 100644
--- a/tests/util.ts
+++ b/tests/util.ts
@@ -166,6 +166,7 @@ export class Util {
 	}
 
 	static by_data_test_id_str(data_test_id: string): string {
+		console.log(`Seaching for ${data_test_id}`)
 		return `[data-test-id="${data_test_id}"]`;
 	}