diff --git a/apps/files/src/components/FilesAppBar.vue b/apps/files/src/components/FilesAppBar.vue
index 68eb1fffce4..fc5d5a48a37 100644
--- a/apps/files/src/components/FilesAppBar.vue
+++ b/apps/files/src/components/FilesAppBar.vue
@@ -8,7 +8,10 @@
         </div>
         <span class="uk-flex uk-flex-middle" v-if="!showBreadcrumb">
           <oc-icon v-if="pageIcon" :name="pageIcon" class="uk-margin-small-right" />
-          <span class="uk-text-lead">{{pageTitle}}</span>
+          <h1 class="oc-page-title" v-text="pageTitle" />
+        </span>
+        <span v-else-if="showBreadcrumb">
+          <h1 class="oc-visually-hidden" v-text="pageTitle" />
         </span>
       </div>
       <div v-if="!publicPage()" class="uk-width-auto uk-visible@m">
diff --git a/src/pages/account.vue b/src/pages/account.vue
index 6a1cceda6ac..c834fca645b 100644
--- a/src/pages/account.vue
+++ b/src/pages/account.vue
@@ -3,7 +3,7 @@
     <oc-loader v-if="loading" />
     <div v-if="!loading" class="uk-width-3-4@m uk-container uk-padding">
       <div class="uk-flex uk-flex-between uk-flex-middle">
-        <span class="uk-text-lead" v-translate>Account</span>
+        <h1 id="account-page-title" class="oc-page-title" v-translate>Account</h1>
         <oc-button icon="exit_to_app" @click="$_oc_settingsAccount_logout"><translate>Logout</translate></oc-button>
       </div>
       <hr />
diff --git a/tests/acceptance/pageObjects/accountPage.js b/tests/acceptance/pageObjects/accountPage.js
index 325941f16c6..72e77a45b2d 100644
--- a/tests/acceptance/pageObjects/accountPage.js
+++ b/tests/acceptance/pageObjects/accountPage.js
@@ -58,8 +58,7 @@ module.exports = {
   },
   elements: {
     accountDisplay: {
-      selector: '//div//span[.="Account"]',
-      locateStrategy: 'xpath'
+      selector: '#account-page-title'
     },
     accountInformationElements: {
       selector: '//div/span[.="Account Information"]/../../div[@class="uk-flex uk-flex-wrap"]/div',