Merge remote-tracking branch 'source/develop' into HEAD [skip ci]

3 files changed, 12 insertions, 2 deletions

diff --git a/.all-contributorsrc b/.all-contributorsrc
index b8f57fb93..d0dd712eb 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -794,6 +794,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "k0staa",
+      "name": "Michał Kostewicz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6313392?v=4",
+      "profile": "http://code-addict.pl",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 6,
diff --git a/README.md b/README.md
index 20b5bf0b7..33989723e 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@
 <p align="center">
 <img alt="GitHub Releases" src="https://img.shields.io/github/downloads/getferdi/ferdi/latest/total?label=Downloads&logo=iCloud&logoColor=%23FFFFFF">
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-80-default.svg?logo=github' alt='Contributors'/></a>
+<a href='#contributors-'><img src='https://img.shields.io/badge/contributors-81-default.svg?logo=github' alt='Contributors'/></a>
 <!-- ALL-CONTRIBUTORS-BADGE:END --> 
 <a href="#backers-via-opencollective"><img alt="Open Collective backers" src="https://img.shields.io/opencollective/backers/getferdi?logo=open-collective"></a>
 <a href="#sponsors-via-opencollective"><img alt="Open Collective sponsors" src="https://img.shields.io/opencollective/sponsors/getferdi?logo=open-collective"></a>
@@ -434,6 +434,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://github.com/kawarimidoll"><img src="https://avatars0.githubusercontent.com/u/8146876?v=4?s=40" width="40px;" alt=""/><br /><sub><b>カワリミ人形</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=kawarimidoll" title="Documentation">📖</a></td>
     <td align="center"><a href="https://immortal-pc.info/"><img src="https://avatars0.githubusercontent.com/u/5358076?v=4?s=40" width="40px;" alt=""/><br /><sub><b>1mm0rt41PC</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=1mm0rt41PC" title="Code">💻</a></td>
+    <td align="center"><a href="http://code-addict.pl"><img src="https://avatars.githubusercontent.com/u/6313392?v=4?s=40" width="40px;" alt=""/><br /><sub><b>Michał Kostewicz</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=k0staa" title="Code">💻</a></td>
   </tr>
 </table>
 
diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js
index 5c3dc21d0..809bfda6e 100644
--- a/src/components/settings/account/AccountDashboard.js
+++ b/src/components/settings/account/AccountDashboard.js
@@ -209,7 +209,7 @@ class AccountDashboard extends Component {
                           </div>
                           <div className="account__info">
                             <H1>
-                              <span className="username">{`${user.firstname} ${isUsingFranzServer ? user.lastname : ''}`}</span>
+                              <span className="username">{`${user.firstname} ${user.lastname}`}</span>
                               {user.isPremium && (
                                 <>
                                   {' '}