diff --git a/locales/de/main.ftl b/locales/de/main.ftl
index d8c9374..4436faa 100644
--- a/locales/de/main.ftl
+++ b/locales/de/main.ftl
@@ -14,4 +14,11 @@ danger-zone = Achtung!
 danger-zone-text = Verändern Sie den Code von bereits veröffentlichten Links nicht. Sollte es dennoch geschehen werden veröffentlichte links unbenutzbar. Wird das Linkziel verändert, so zeigen auch die bereits veröffentlichten Links auf das neue Ziel.
 
 save-edits = Speichere die Veränderungen
-delete-link = Diesen Link löschen
\ No newline at end of file
+delete-link = Diesen Link löschen
+
+edit-user-headline = Benutzereinstellungen von: {$username}
+username = Benutzername
+email = Email
+password = Passwort
+password-placeholder = Leer lassen um das Passwort nicht zu ändern
+save-user = Benutzer speichern
\ No newline at end of file
diff --git a/locales/en/main.ftl b/locales/en/main.ftl
index 6eaa261..27b1a38 100644
--- a/locales/en/main.ftl
+++ b/locales/en/main.ftl
@@ -6,12 +6,19 @@ welcome-user = Wellcome {$username}
 logout = Logout
 
 edit-link-headline = Edit link: {$linktitle}
-link-description = Description:
-link-target = Link target:
-link-code = Link code:
+link-description = Description
+link-target = Link target
+link-code = Link code
 
 danger-zone = Danger Zone!
 danger-zone-text = Do not change the code of links that are published. If you do so the published links will become invalid! If you change the target the published links will point to the new target.
 
 save-edits = Save edits
 delete-link = Delete this link
+
+edit-user-headline = User Settings of: {$username}
+username = Username
+email = Email
+password = Password
+password-placeholder = Leave this empty to keep the current password
+save-user = Save this user
diff --git a/templates/edit_link.html b/templates/edit_link.html
index 8a9b71d..cfa1af7 100644
--- a/templates/edit_link.html
+++ b/templates/edit_link.html
@@ -5,15 +5,15 @@
     <h1>{{ fluent(key="edit-link-headline", lang=user.language, linktitle=link.title) }}</h1>
     <form action="" method="POST">
         <div>
-            <label for="title">{{ fluent(key="link-description", lang=user.language) }}</label>
+            <label for="title">{{ fluent(key="link-description", lang=user.language) }}:</label>
             <input type="text" name="title" value="{{ link.title }}">
         </div>
         <div>
-            <label for="target">{{ fluent(key="link-target", lang=user.language) }}</label>
+            <label for="target">{{ fluent(key="link-target", lang=user.language) }}:</label>
             <input type="text" name="target" value="{{link.target}}">
         </div>
         <div>
-            <label for="code">{{ fluent(key="link-code", lang=user.language) }}</label>
+            <label for="code">{{ fluent(key="link-code", lang=user.language) }}:</label>
             <input type="text" name="code" value="{{link.code}}">
         </div>
         <div class="actions danger">
diff --git a/templates/edit_profile.html b/templates/edit_profile.html
index 60e5861..069867a 100644
--- a/templates/edit_profile.html
+++ b/templates/edit_profile.html
@@ -2,21 +2,27 @@
 
 {% block admin %}
 <div class="center">
-    <h1>Profil von {{user.username}}</h1>
+    <h1>{{ fluent(key="edit-user-headline", lang=user.language, username=user.username) }}
+    </h1>
     <form action="" method="POST">
         <div>
-            <label for="username">Benutzername:</label>
+            <label for="username">{{ fluent(key="username", lang=user.language)
+                }}:</label>
             <input type="text" name="username" value="{{ user.username }}">
         </div>
         <div>
-            <label for="email">E-mail:</label>
+            <label for="email">{{ fluent(key="email", lang=user.language)
+                }}:</label>
             <input type="email" name="email" value="{{ user.email }}">
         </div>
         <div>
-            <label for="password">Passwort:</label>
-            <input type="password" name="password" placeholder="Leer lassen um nichts zu ändern">
+            <label for="password">{{ fluent(key="password", lang=user.language)
+                }}:</label>
+            <input type="password" name="password" placeholder='{{ fluent(key="password-placeholder", lang=user.language)
+        }}'>
         </div>
-        <input type="submit" value="Speichern">
+        <input type="submit" value='{{ fluent(key="save-user", lang=user.language)
+    }}'>
     </form>
     <h2>&nbsp;</h2>
 </div>