diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56495f0..c123853 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+- Update links to @fediversespace Mastodon account
 
 ### Deprecated
 
diff --git a/README.md b/README.md
index 6dcccec..a7ce42c 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,21 @@
 
 The map of the fediverse that you always wanted.
 
-Read the latest updates on Mastodon: [@fediversespace](https://cursed.technology/@fediversespace)
+Read the latest updates on Mastodon: [@fediversespace](https://mastodon.social/@fediversespace)
 
 ![A screenshot of fediverse.space](screenshot.png)
 
-1. [Requirements](#requirements)
-2. [Running it](#running-it)
-3. [Commands](#commands)
-4. [Privacy](#privacy)
-5. [Deployment](#deployment)
-6. [Acknowledgements](#acknowledgements)
+- [fediverse.space 🌐](#fediversespace-%f0%9f%8c%90)
+  - [Requirements](#requirements)
+  - [Running it](#running-it)
+    - [Backend](#backend)
+    - [Frontend](#frontend)
+  - [Commands](#commands)
+    - [Backend](#backend-1)
+    - [Frontend](#frontend-1)
+  - [Privacy](#privacy)
+  - [Deployment](#deployment)
+  - [Acknowledgements](#acknowledgements)
 
 ## Requirements
 
diff --git a/frontend/src/components/screens/LoginScreen.tsx b/frontend/src/components/screens/LoginScreen.tsx
index 0d43914..57f0569 100644
--- a/frontend/src/components/screens/LoginScreen.tsx
+++ b/frontend/src/components/screens/LoginScreen.tsx
@@ -79,11 +79,11 @@ class LoginScreen extends React.PureComponent<{}, ILoginScreenState> {
         </p>
         <p className={Classes.RUNNING_TEXT}>
           It's currently only possible to administrate Mastodon and Pleroma instances. If you want to login with a
-          direct message, your instance must federate with cursed.technology and vice versa.
+          direct message, your instance must federate with mastodon.social and vice versa.
         </p>
         <p className={Classes.RUNNING_TEXT}>
           If you run another server type, you can manually opt in or out by writing to{" "}
-          <a href="https://cursed.technology/@fediversespace">@fediversespace</a>.
+          <a href="https://mastodon.social/@fediversespace">@fediversespace</a>.
         </p>
         <FormContainer error={this.state.error}>{content}</FormContainer>
       </Page>