diff --git a/FAQ.md b/FAQ.md
index 224c837..84cdf06 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -5,15 +5,23 @@
 [TOC]
 
 # Basics
-## How do I log in?
-## How do I start a new room?
-## How do I start a new direct message?
-## How do I join an existing room?
-## How do I join an existing room on another server?
-## 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?
+## Before being logged in
+### How do I log in with username and password?
+### How do I log in with SSO (For example Mozilla or Element One)?
+## In the Room list
+### How do I start a new room?
+### How do I start a new direct message?
+### How do I join an existing room?
+### How do I join an existing room on another server?
+## In a Room or Direct Message
+### 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?
 # Intermediate
-## How do I use the Emotes setting?
-## How do I use Emotes in chats?
-## How do I use Emotes from others?
\ No newline at end of file
+## Emotes
+### What are emotes?
+### Are Emotes the same as Sticker?
+### How do I use the Emotes setting?
+### How do I use Emotes in chats?
+### How do I use Emotes from others?
+