diff --git a/src/portal/src/app/account/sign-up/sign-up.component.html b/src/portal/src/app/account/sign-up/sign-up.component.html
index 5a5562892..957122873 100644
--- a/src/portal/src/app/account/sign-up/sign-up.component.html
+++ b/src/portal/src/app/account/sign-up/sign-up.component.html
@@ -7,6 +7,6 @@
     <div class="modal-footer">
         <span class="spinner spinner-inline loading-top" [hidden]="inProgress === false"> </span>
         <button type="button" class="btn btn-outline" (click)="close()">{{'BUTTON.CANCEL' | translate}}</button>
-        <button type="button" class="btn btn-primary" [disabled]="!isValid || inProgress" (click)="create()">{{ 'BUTTON.SIGN_UP' | translate }}</button>
+        <button id="sign-up" type="button" class="btn btn-primary" [disabled]="!isValid || inProgress" (click)="create()">{{ 'BUTTON.SIGN_UP' | translate }}</button>
     </div>
 </clr-modal>
\ No newline at end of file
diff --git a/tests/resources/Harbor-Pages/HomePage_Elements.robot b/tests/resources/Harbor-Pages/HomePage_Elements.robot
index d1ecc1208..15e54c186 100644
--- a/tests/resources/Harbor-Pages/HomePage_Elements.robot
+++ b/tests/resources/Harbor-Pages/HomePage_Elements.robot
@@ -24,12 +24,10 @@ ${realname_xpath}  //*[@id='realname']
 ${newPassword_xpath}  //*[@id='newPassword']
 ${confirmPassword_xpath}  //*[@id='confirmPassword']
 ${comment_xpath}  //*[@id='comment']
-${signup_xpath}  //clr-modal/div/div[1]/div/div/div[3]/button[2]
-
-${signup_xpath}  /html/body/harbor-app/harbor-shell/clr-main-container/div/div/sign-in/sign-up/clr-modal/div/div[1]/div/div[1]/div/div[3]/button[2]
-${search_input}  xpath=//*[@id='search_input']
-${login_btn}  id=log_in
-${harbor_span_title}  xpath=//span[contains(., 'Harbor')]
-${login_name}  id=login_username
-${login_pwd}  id=login_password
+${signup_xpath}  //*[@id='sign-up']
+${search_input}  //*[@id='search_input']
+${login_btn}  //*[@id='log_in']
+${harbor_span_title}  //span[contains(., 'Harbor')]
+${login_name}  //*[@id='login_username']
+${login_pwd}  //*[@id='login_password']