diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c0adb98..9e81f64e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added support for importing dividends from a data provider
 
+### Changed
+
+- Extended the Frequently Asked Questions (FAQ) page
+
 ## 1.224.0 - 2023-01-04
 
 ### Added
diff --git a/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html b/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
index 0833edb0..4a50e447 100644
--- a/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
+++ b/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
@@ -125,7 +125,7 @@
             feedback, bug reports, feature requests and of course contributions!
           </p>
           <p>
-            You can reach me by email at
+            You can reach me by e-mail at
             <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
             <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>.
           </p>
diff --git a/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html b/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
index c91c9163..93ef5d41 100644
--- a/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
+++ b/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
@@ -99,7 +99,7 @@
             >
             of users. In the future, I would like to involve more contributors
             to further extend the functionality of Ghostfolio (e.g. with new
-            reports). Get in touch with me by email at
+            reports). Get in touch with me by e-mail at
             <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
             <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> if you
             are interested, I’m happy to discuss ideas.
diff --git a/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html b/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
index 19a6a257..7a72ada1 100644
--- a/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
+++ b/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
@@ -64,15 +64,15 @@
           <p>
             When you authenticate with <i>Internet Identity</i>, the service
             only gets a dedicated pseudonym rather than sensitive user data like
-            the email address or phone number. This preserves your anonymity and
-            prevents you being tracked on the Internet.
+            the e-mail address or phone number. This preserves your anonymity
+            and prevents you being tracked on the Internet.
           </p>
         </section>
         <section class="mb-4">
           <h2 class="h4">The key benefits in a nutshell</h2>
           <ul>
             <li>
-              Authenticate yourself securely without the need of an email
+              Authenticate yourself securely without the need of an e-mail
               address, username, or a password: all you need is your device to
               log in.
             </li>
@@ -89,7 +89,7 @@
         <section class="mb-4">
           <p>
             If you would like to provide feedback or get involved in further
-            development of Ghostfolio, please get in touch by email via
+            development of Ghostfolio, please get in touch by e-mail via
             <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
             <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>.
           </p>
diff --git a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
index 993755fd..37f87967 100644
--- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
+++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
@@ -62,7 +62,7 @@
             new and better Internet based on decentralized blockchains to give
             power back to the users. <i>Internet Identity</i> created by the
             <a href="https://dfinity.org">Dfinity Foundation</a> enables you to
-            sign in securely and anonymously to Ghostfolio without an email
+            sign in securely and anonymously to Ghostfolio without an e-mail
             address, username, or a password. All you need is your device with
             built-in biometric authentication.
           </p>
@@ -90,7 +90,7 @@
             onboard more contributors who are actively involved in software
             engineering to realize the full potential of open source software.
             If you are a web developer and interested in personal finance,
-            please get in touch by email via
+            please get in touch by e-mail via
             <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
             <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>. We are
             happy to discuss ideas.
diff --git a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
index f2d9e90b..5807819e 100644
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
@@ -83,7 +83,7 @@
             <a href="https://ghostfolio.slack.com">Slack community</a> or get in
             touch on Twitter
             <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> or by
-            email via <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
+            e-mail via <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
           </p>
           <p>
             We look forward to hearing from you.<br />
diff --git a/apps/client/src/app/pages/faq/faq-page.html b/apps/client/src/app/pages/faq/faq-page.html
index de73f3c2..7e18aa57 100644
--- a/apps/client/src/app/pages/faq/faq-page.html
+++ b/apps/client/src/app/pages/faq/faq-page.html
@@ -48,7 +48,7 @@
           <a href="../en/blog/2022/07/ghostfolio-meets-internet-identity"
             >Internet Identity</a
           >) enable you to sign in securely and anonymously to Ghostfolio. There
-          is no need for an email address, phone number, or a username.
+          is no need for an e-mail address, phone number, or a username.
         </mat-card-content>
       </mat-card>
       <mat-card class="mb-3">
@@ -57,10 +57,11 @@
           >This project is driven by the efforts of contributors from around the
           world. The
           <a href="https://github.com/ghostfolio/ghostfolio">source code</a> is
-          fully available as open source software (OSS). Our
+          fully available as open source software (OSS). Thanks to our generous
           <a [routerLink]="['/pricing']">Ghostfolio Premium</a> users and
-          <a href="https://www.buymeacoffee.com/ghostfolio">sponsors</a> allow
-          us to run a free, limited plan for new investors.</mat-card-content
+          <a href="https://www.buymeacoffee.com/ghostfolio">sponsors</a> we have
+          the ability to run a free, limited plan for new
+          investors.</mat-card-content
         >
       </mat-card>
       <mat-card class="mb-3">
@@ -77,7 +78,8 @@
           ><a [routerLink]="['/pricing']">Ghostfolio Premium</a> is a fully
           managed Ghostfolio cloud offering for ambitious investors. The revenue
           is used to cover the hosting infrastructure. It is the Open Source
-          code base with some extras like the market overview.</mat-card-content
+          code base with some extras like the
+          <a [routerLink]="['/markets']">markets overview</a>.</mat-card-content
         >
       </mat-card>
       <mat-card class="mb-3">
@@ -85,24 +87,45 @@
         <mat-card-content
           >Yes, you can try
           <a [routerLink]="['/pricing']">Ghostfolio Premium</a> by signing up
-          for Ghostfolio and applying for a trial (see “My Ghostfolio”). It’s
+          for Ghostfolio and applying for a trial (see “My Ghostfolio”). It is
           easy, free and there is no commitment. You can stop using it at any
           time.</mat-card-content
         >
       </mat-card>
+      <mat-card class="mb-3">
+        <mat-card-title
+          >How can I get a student discount for Ghostfolio
+          Premium?</mat-card-title
+        >
+        <mat-card-content
+          >Request your student discount
+          <a href="mailto:hi@ghostfol.io?Subject=Student Discount">here</a> with
+          your university e-mail address.</mat-card-content
+        >
+      </mat-card>
       <mat-card class="mb-3">
         <mat-card-title>Which devices are supported?</mat-card-title>
         <mat-card-content
           >Ghostfolio works in every modern web browser on smartphones, tablets
-          and desktop computers (where you have even more analysis options and
-          statistics). For Android users, there is a dedicated Ghostfolio app
-          available in the
+          and desktop computers. For <i>Android</i> users, there is a dedicated
+          Ghostfolio app available in the
           <a
             href="https://play.google.com/store/apps/details?id=ch.dotsilver.ghostfolio.twa"
             >Google Play Store</a
           >.</mat-card-content
         >
       </mat-card>
+      <mat-card class="mb-3">
+        <mat-card-title
+          >I cannot find my broker in the list of platforms. What can I
+          do?</mat-card-title
+        >
+        <mat-card-content>
+          Please send an e-mail with the web address of your broker to
+          <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> and we are happy to
+          add it.
+        </mat-card-content>
+      </mat-card>
       <mat-card class="mb-3">
         <mat-card-title
           >Ghostfolio sounds cool, how can I get involved?</mat-card-title
@@ -117,7 +140,7 @@
           >, a star on
           <a href="https://github.com/ghostfolio/ghostfolio">GitHub</a>,
           feedback, bug reports, feature requests and of course contributions!
-          You can reach us by email at
+          You can reach us by e-mail at
           <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
           <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a
           >.</mat-card-content
diff --git a/apps/client/src/app/pages/pricing/pricing-page.html b/apps/client/src/app/pages/pricing/pricing-page.html
index 4ed48e4a..9245a6ac 100644
--- a/apps/client/src/app/pages/pricing/pricing-page.html
+++ b/apps/client/src/app/pages/pricing/pricing-page.html
@@ -18,7 +18,7 @@
           to use our referral link and get a Ghostfolio Premium membership for
           one year. Looking for a student discount? Request it
           <a href="mailto:hi@ghostfol.io?Subject=Student Discount">here</a> with
-          your university email address.
+          your university e-mail address.
         </p>
         <p>
           If you prefer to run Ghostfolio on your own infrastructure, please