diff --git a/ldapcherry/__init__.py b/ldapcherry/__init__.py
index a5655aa..97828f0 100644
--- a/ldapcherry/__init__.py
+++ b/ldapcherry/__init__.py
@@ -445,7 +445,7 @@
     def adduser(self, **params):
         """ add user page """
         self._check_auth(must_admin=True)
-        form = self.temp_form.render(attributes=self.attributes.attributes)
+        form = self.temp_form.render(attributes=self.attributes.attributes, values=None)
         return self.temp_adduser.render(form=form)
 
     @cherrypy.expose
@@ -464,5 +464,5 @@
     def selfmodify(self, **params):
         """ self modify user page """
         self._check_auth(must_admin=False)
-        form = self.temp_form.render(attributes=self.attributes.get_selfattributes())
+        form = self.temp_form.render(attributes=self.attributes.get_selfattributes(), values=None)
         return self.temp_selfmodify.render(form=form)
diff --git a/resources/templates/form.tmpl b/resources/templates/form.tmpl
index 10a6f35..62da6dc 100644
--- a/resources/templates/form.tmpl
+++ b/resources/templates/form.tmpl
@@ -2,18 +2,27 @@
 <% attr = attributes[a] %>
 <div class="form-group">
 <div class="input-group">
+  <% 
+    if not values is None and a in values:
+        value = ' value="'+ values[a] + '"'
+        value2 = '<option>'+ values[a] +'</option>'
+    else:
+        value = ''
+        value2 = ''
+  %>
   <span class="input-group-addon" id="basic-addon1">${attr['display_name']}</span>
     % if attr['type'] == 'string':
-  <input type="text"   name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required>
+  <input type="text"   name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required ${value}>
     % elif attr['type'] == 'email':
-  <input type="email"  name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required data-error="email address is invalid">
+  <input type="email"  name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required ${value} data-error="email address is invalid">
     % elif attr['type'] == 'int':
-  <input type="number" name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required>
+  <input type="number" name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required ${value}>
     % elif attr['type'] == 'fix':
   <input type="hidden"   name="${a}" class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1" required value="${attr['value']}">
   <span class="form-control" placeholder="${attr['description']}" aria-describedby="basic-addon1">${attr['value']}</span>
     % elif attr['type'] == 'stringlist':
   <select class="form-control" name="type">
+        ${value2}
         %for val in attr['values']:
         <option>${val}</option>
         %endfor