diff --git a/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2
index 8ef7c0554d782f8f4c24d7b377990ee0de0859ef..5a3ad381d511d7eb8f7f33a14b1e719ccd7a7509 100644
--- a/app/templates/auth/reset_password.html.j2
+++ b/app/templates/auth/reset_password.html.j2
@@ -6,13 +6,6 @@
     <form method="POST">
       <div class="card-content">
         {{ form.hidden_tag() }}
-        <div class="input-field">
-          {{ form.email(class='validate', type='email') }}
-          {{ form.email.label }}
-          {% for error in form.email.errors %}
-            <span class="helper-text" style="color:red;">{{ error }}</span>
-          {% endfor %}
-        </div>
         <div class="input-field">
           {{ form.password(class='validate', type='password') }}
           {{ form.password.label }}
diff --git a/app/templates/auth/settings.html.j2 b/app/templates/auth/settings.html.j2
index c0bf3474509af69b9fed337a5901aa6242e16825..1f718983f29472750e586ac22e8596ce0fa10f13 100644
--- a/app/templates/auth/settings.html.j2
+++ b/app/templates/auth/settings.html.j2
@@ -13,16 +13,15 @@
         {{ form.hidden_tag() }}
         <div class="input-field ">
           <i class="material-icons prefix">email</i>
-          {{ form.email(type='email', placeholder=current_user.email) }}
+          {{ form.email(type='email', value=current_user.email) }}
           {{ form.email.label }}
-          <span class="helper-text" data-error="wrong" data-success="right">When changing your e-mail adress you will have to reconfirm it.</span>
           {% for error in form.email.errors %}
             <span class="helper-text" style="color:red;">{{ error }}</span>
           {% endfor %}
         </div>
         <div class="input-field ">
           <i class="material-icons prefix">person</i>
-          {{ form.username(placeholder=current_user.username) }}
+          {{ form.username(value=current_user.username) }}
           {{ form.username.label }}
           {% for error in form.username.errors %}
             <span class="helper-text" style="color:red;">{{ error }}</span>