diff --git a/content/first-steps/_index.en.md b/content/first-steps/_index.en.md
index 4dd6de92fcce14f57e0f4489e1cae74de680df82..3ea10f13077706536f3bdf28b27b66075b0ee85f 100644
--- a/content/first-steps/_index.en.md
+++ b/content/first-steps/_index.en.md
@@ -17,25 +17,23 @@ We recommend using the Element desktop client, because this avoids most problems
 
 Downloads for: {{% button href="https://packages.riot.im/desktop/install/win32/x64/Element%20Setup.exe" icon="fas fa-download" %}}Windows{{% /button %}} {{% button href="https://packages.riot.im/desktop/install/macos/Element.dmg" icon="fas fa-download" %}}macOS{{% /button %}} {{% button href="/clients/install_linux" icon="fas fa-download" %}}Linux{{% /button %}}
 
-After a desktop installation, make sure to use the existing account with the University Login and not to create a new account on another server. Here the example of Element:
+After a desktop installation, make sure to use the existing account with the h-da login and not to create a new account on another server. Here the example of Element:
 
 ![Selected login button in the element matrix client](/images/01_Login_en.png)
 
-This is done by clicking on **Change**. Then you will not accidentally end up on the wrong server...
+This is done by clicking on **Edit**. Then you will not accidentally end up on the wrong server...
 
 ![Change login page with focus on the homeserver button](/images/02_Change-Homeserver_en.png)
 
-Now you can manually specify the home server: https://matrix.fbi.h-da.de
+Now you can manually specify the home server: **matrix.fbi.h-da.de**
 
 ![Input field to change the home server with the input matrix.fbi.h-da.de](/images/03_Set-Homeserver_en.png)
 
-Afterwards the login with university login and university password must be carried out:
+The drop-down menu "Sign in with" should be left at "User name". Afterwards the login with your h-da login and h-da password.
 
-The drop-down menu "Log in with:" should be left at "User name". Then the following entries must be made:
+**Username: h-da login** (only the h-da-login, no e-mail address!)
 
-**Username: University-Login** (only the University-Login, no e-mail address!)
-
-**Password: University-Password**
+**Password: h-da password**
 
 An alternative login, e.g. using the e-mail address, is **NOT** possible during the first, initial login, only after the second login.
 
@@ -43,7 +41,7 @@ After the first login there is also no e-mail / confirmation mail.
 
 Analogous to e-mail addresses, this results in matrix addresses with the following structure:
 
-@University-Login:matrix.fbi.h-da.de
+@h-da-login:matrix.fbi.h-da.de
 
 ![Login window with request to enter University login and password](/images/04_Username_en.png)
 
@@ -55,17 +53,19 @@ Matrix not only encrypts transports to and from the home server (in the data cen
 It is highly recommended to use this key backup (with a secure security phrase which is NOT your University password) and read on at [Other important settings]({{< relref "settings/_index.en.md" >}})!
 {{% /notice %}}
    
+ If you login for the fist time or login again without having made any backup of your securitykey yet, then the following window will be shown:
+
 ![Screenshot of the prompt to enter a security phrase](/images/01_Restore-Session_withoutKey_en.png)
 
-You have to skip this too, because you did not have any protection key yet:
+You have to "skip" this, because you did not have any security key yet:
    
 ![Confirmation of skipping the input of a security phrase](/images/03_Cancel-Restore_en.png)
 
-Key protection is highly recommended for worry-free end-to-end encryption. Therefore you have to choose "Settings/Security & Privacy". Please look for "Encryption" and choose "setup secure backup".
+Key protection is highly recommended for worry-free end-to-end encryption. Therefore you have to choose "Settings/Security & Privacy". Please look for "Encryption" and choose "set up" secure backup.
 
 ![secure backup of securitykey step1](/images/03_Make_Key_Backup_1_en.png)
 
-Alternatively you can choose "Security & Privacy" by clicking the "arrow-down" symbol right next to your username.
+Alternatively you can choose "Security & Privacy" by clicking the downward pointing triangle symbol right next to your username.
 
 ![secure backup of securitykey step1](/images/10_Setup-Keystore_en.png)
 
diff --git a/content/first-steps/_index.md b/content/first-steps/_index.md
index 48f21b9abaa7c25959ada553324152530302c60d..00b677d425560f457fc3f8aea4d5006d8d5b8d1e 100644
--- a/content/first-steps/_index.md
+++ b/content/first-steps/_index.md
@@ -24,12 +24,14 @@ Hier am Beispiel von Element:
 
 Dies wird durch Klick auf **Bearbeiten** realisiert. Dann landet man nicht versehentlich auf einem falschen Server...
 
-![Eingabefeld zum Ändern des Homeservers mit der Eingabe matrix.tu-dresden.de](/images/03_Set-Homeserver_de.png)
+![Change login page with focus on the homeserver button](/images/02_Change-Homeserver_de.png)
 
 Nun kann man manuell die Angabe des Heimservers durchführen: **matrix.fbi.h-da.de**
 
-Dropdown-Menü „Anmelden mit:“ sollte auf „Benutzername“ belassen werden. 
-Anschließend ist der einmalige Login mit h-da-Login und h-da-Passwort durchzuführen:
+![Eingabefeld zum Ändern des Homeservers mit der Eingabe matrix.tu-dresden.de](/images/03_Set-Homeserver_de.png)
+
+Das Dropdown-Menü "Anmelden mit" sollte auf „Benutzername“ belassen werden. 
+Anschließend ist der einmalige Login mit h-da Login und h-da Passwort durchzuführen:
 
 **Benutzername: Hochschul-Account**  (nur der Hochschul-Accounts, keine E-Mail-Adresse!)
 
@@ -41,7 +43,7 @@ Es folgt nach dem Erstlogin auch keine E-Mail / Bestätigungsmail.
 
 Analog zu E-Mail-Adressen ergeben sich damit Matrix-Adressen folgender Struktur:
 
-@Hochschul-Accounts:matrix.fbi.h-da.de
+@h-da-Account:matrix.fbi.h-da.de
 
 ![Loginfenster mit Aufforderung ZIH Login und Passwort einzugeben](/images/04_Username_de.png)
 
@@ -55,7 +57,7 @@ Matrix verschlüsselt nicht nur die Transporte von und zu dem Heimserver (im Rec
 Es wird dringend empfohlen, diese Schlüsselsicherung zu nutzen (mit einer sicheren Sicherheitsphrase, welche NICHT Ihr Hochschul-Password ist) und am Punkt [Weitere wichtige Einstellungen]({{< relref "settings/_index.md" >}}) weiterlesen!
 {{% /notice %}}
 
-Wenn Sie sich nun ohne Schlüsselsicherung am Elements-Clients abmelden und später erneut anmelden, erscheint folgendes Fenster:
+Wenn Sie sich erstmals an Elements anmelden oder ohne Schlüsselsicherung am Elements-Clients abmelden und später erneut anmelden, erscheint folgendes Fenster:
 
    ![Screenshot der Aufforderung eine Sicherheitsphrase einzugeben](/images/01_Restore-Session_withoutKey_de.png)
 
diff --git a/content/settings/_index.en.md b/content/settings/_index.en.md
index 55c47c48f9532dc007a2d99229a7ecde80f2d6db..f9f8a5280b2b2420bffd38bb26a0a8e936c1e251 100644
--- a/content/settings/_index.en.md
+++ b/content/settings/_index.en.md
@@ -15,17 +15,19 @@ Matrix not only encrypts transports to and from the home server (in the data cen
 It is highly recommended to use this key backup (with a secure security phrase which is NOT your University password) and read on at [Other important settings]({{< relref "settings/_index.en.md" >}})!
 {{% /notice %}}
    
+ If you login for the fist time or login again without having made any backup of your securitykey yet, then the following window will be shown:
+
 ![Screenshot of the prompt to enter a security phrase](/images/01_Restore-Session_withoutKey_en.png)
 
-You have to skip this too, because you did not have any protection key yet:
+You have to "skip" this, because you did not have any security key yet:
    
 ![Confirmation of skipping the input of a security phrase](/images/03_Cancel-Restore_en.png)
 
-Key protection is highly recommended for worry-free end-to-end encryption. Therefore you have to choose "Settings/Security & Privacy". Please look for "Encryption" and choose "setup secure backup".
+Key protection is highly recommended for worry-free end-to-end encryption. Therefore you have to choose "Settings/Security & Privacy". Please look for "Encryption" and choose "set up" secure backup.
 
 ![secure backup of securitykey step1](/images/03_Make_Key_Backup_1_en.png)
 
-Alternatively you can choose "Security & Privacy" by clicking the "arrow-down" symbol right next to your username.
+Alternatively you can choose "Security & Privacy" by clicking the downward pointing triangle symbol right next to your username.
 
 ![secure backup of securitykey step1](/images/10_Setup-Keystore_en.png)
 
@@ -65,16 +67,16 @@ After successfully setting up the key backup, you now activate the desktop notif
 
    This can be undone later and especially individual "conversations" can be set in their notification authority
 
-Adjust settings in the Settings menu: to do this, click on the line of the e-mail address and the downward pointing triangle and then on the line "All settings":
+Adjust settings in the settings menu: to do this, click on the line of the e-mail address and the downward pointing triangle and then on the line "All settings":
 
 ![Selection of the menu item Settings in the user:inside menu](/images/06_Settings_en.png)
 
 In the settings you can change your display name ("First Name Last Name") in the **General** tab if necessary and upload a profile picture (similar to the contact box on the TUD website; select profile picture <5MB):
 ![Marking of the field Display name and profile picture in the settings](/images/06_Settings-Names_en.png)
 
-In the medium term the display name will be obtained from the Common Name in the LDAP of the Darmstadt University of Applied Sciences, then a manual change is no longer necessary.
+In the medium term the display name will be obtained from the common name in the LDAP of the Darmstadt University of Applied Sciences, then a manual change is no longer necessary.
 
-The e-mail address field is not necessarily to be filled in, since an e-mail address is stored via your University login. Theoretically you can add more addresses here, e.g. to have notifications about missed messages sent to another e-mail address.
+The e-mail address field is not necessarily to be filled in, since an e-mail address is stored via your h-da login. Theoretically you can add more addresses here, e.g. to have notifications about missed messages sent to another e-mail address.
 
 On the same page you can also change the design theme from light to dark.
 
@@ -86,9 +88,9 @@ In the **Voice & Video** tab, you can authorize the Matrix client element to use
 
 ![Screenshot of the settings menu language and video](/images/06_Settings-Media_en.png)
 
-Fortunately, 1:1 calls start end-to-end encrypted by default. To really trust this encryption with a good feeling, users:inside can perform the key comparison with interlocutor:inside. To ensure that this also applies to all devices of these conversational partners, Matrix users must in turn verify the keys of all their devices with each other (technical term: cross-signing). If you follow the instructions below, this can be done very conveniently.
+Fortunately, 1:1 calls start end-to-end encrypted by default. To really trust this encryption with a good feeling, users can perform the key comparison with their partners of conversation. To ensure that this also applies to all devices of these conversational partners, Matrix users must verify the keys of all their devices with each other (technical term: cross-signing). If you follow the instructions below, this can be done very conveniently.
 
-In the **Security & Privacy** tab you will find all your devices that have been used by the Matrix account so far. 
+In the **Security & Privacy** tab you will find all your devices that have been used by the matrix account so far. 
 
 * Remove any sessions that are no longer in use by marking the square box at the end of the line and clicking on the red button that appears.
   
diff --git a/content/settings/_index.md b/content/settings/_index.md
index 7dfc7a28863c805e6c869d9644c98ae04c32fdea..b8fd2014ce8fb259b374148b703c139b5cf5ebcc 100644
--- a/content/settings/_index.md
+++ b/content/settings/_index.md
@@ -15,7 +15,7 @@ Matrix verschlüsselt nicht nur die Transporte von und zu dem Heimserver (im Rec
 Es wird dringend empfohlen, diese Schlüsselsicherung mit einer sicheren Sicherheitsphrase, welche NICHT Ihr Hochschul-Password ist, oder einem generierten Sicherheitsschlüssel zu nutzen!
 {{% /notice %}}
 
-Wenn Sie sich nun ohne Schlüsselsicherung am Elements-Clients abmelden und später erneut anmelden, erscheint folgendes Fenster:
+Wenn Sie sich erstmals an Elements anmelden oder ohne Schlüsselsicherung am Elements-Clients abmelden und später erneut anmelden, erscheint folgendes Fenster:
 
    ![Screenshot der Aufforderung eine Sicherheitsphrase einzugeben](/images/01_Restore-Session_withoutKey_de.png)
 
@@ -40,11 +40,11 @@ erscheint im nachfolgenden Fenster Ihr Sicherungsschlüssel, den Sie sich unbedi
 
 ![Anzeige des Sicherheitsschlüssel zum abschreiben oder wegspeichern](/images/03_Make_Key_Backup_3_de.png) 
 
-Wenn Sie sich aus Elements abmelden oder auf einem weiteren Gerät einrichten, werden Sie nach Ihrem Sicherungsschlüssel gefragt. Wenn Sie den dann nicht zur Hand haben, haben Sie keinen Zugriff mehr auf Ihre alten verschlüsselten Chats.
+Wenn Sie sich aus Elements abmelden und erneut anmelden oder Elements auf einem weiteren Gerät einrichten, werden Sie nach Ihrem Sicherungsschlüssel gefragt. Wenn Sie den dann nicht zur Hand haben, haben Sie keinen Zugriff mehr auf Ihre alten verschlüsselten Chats.
 
 **Alternativ** zum "Sicherheitsschlüssel generieren" können Sie sich auch selbst eine starke Sicherheitsphrase (bitte nicht das Hochschulpasswort!) erstellen. Weiterhin wird der Sicherungsschlüssel zusätzlich zur Sicherheitsphrase erstellt und sollte als Notfallschlüssel sicher und wiederauffindbar verwahrt werden. Die Sicherheitsphrase wird immer einzugeben sein, wenn Schlüssel mit der Schlüsselsicherung synchronisiert werden sollen.
 
-![Aufforderung den Sicherheitsschlüssel zu generieren oder eine Sicherheitsphrase einzugeben](/images/11_Setup-Key_de.png)
+![Aufforderung den Sicherheitsschlüssel zu generieren oder eine Sicherheitsphrase einzugeben](/images/12_Setup-Key_de.png)
 ![Aufforderung eine Passwort für die Schlüsselsicherung einzugeben](/images/12_Enter-Key_de.png)
 
 Dann werden Sie zur Bestätigung Ihrer Passphrase aufgefordert:
@@ -58,7 +58,6 @@ Zum Abschluß der Schlüsselsicherung werden Sie zur Bestätigung Ihrer Identit
 
 ![Bestätigung der Identität](/images/03_account_validation_de.png) 
 
-
 ## Weitere wichtige Einstellungen
 
 Nach erfolgreicher Einrichtung der Schlüsselsicherung werden Sie gefragt, ob Sie Sie nun die Desktop-Benachrichtigungen aktivieren wollen: