diff --git a/FAQ.md b/FAQ.md
index 84cdf06..fb11856 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -17,6 +17,18 @@
 ### How do I change the title of a room I manage?
 ### How do I change the topic of a room I manage?
 ### How do I change the permissions of a room I manage?
+## In the User Profile
+### How do I change my Display Name?
+### How do I change my Avatar?
+## In the Settings
+### How do I change the Look of my Client?
+## Bug reporting basics
+If you report any kind of Bug, please first search for it at the [existing issues](https://gitlab.com/famedly/fluffychat/-/issues).
+
+If there is none, please start by creating an issue by filling out the issue template to your best effort.
+That means, as a minimum, you need to include the Version you are using and include a description of what went wrong.
+If possible, please also include a screenshot!
+
 # Intermediate
 ## Emotes
 ### What are emotes?
@@ -24,4 +36,6 @@
 ### How do I use the Emotes setting?
 ### How do I use Emotes in chats?
 ### How do I use Emotes from others?
+## Bug Reporting with logs
+_Please also read the bug reporting basics first!_