diff --git a/ldapcherry/__init__.py b/ldapcherry/__init__.py
index 7f21fde..ce47887 100644
--- a/ldapcherry/__init__.py
+++ b/ldapcherry/__init__.py
@@ -840,7 +840,7 @@
         for r in self.roles.flatten:
             display_names[r] = self.roles.flatten[r]['display_name']
         roles_js = json.dumps(display_names, separators=(',',':'))
-        form = self.temp_form.render(attributes=self.attributes.attributes, values=None, modify=False)
+        form = self.temp_form.render(attributes=self.attributes.attributes, values=None, modify=False, autofill=True)
         roles = self.temp_roles.render(roles=self.roles.flatten, graph=self.roles.graph, graph_js=graph_js, roles_js=roles_js, current_roles=None)
         return self.temp_adduser.render(form=form, roles=roles, is_admin=is_admin, notification=notification)
 
@@ -883,7 +883,7 @@
         user_lonely_groups = tmp['unusedgroups']
         roles_js = json.dumps(display_names, separators=(',',':'))
         key = self.attributes.get_key()
-        form = self.temp_form.render(attributes=self.attributes.attributes, values=user_attrs, modify=True, keyattr=key)
+        form = self.temp_form.render(attributes=self.attributes.attributes, values=user_attrs, modify=True, keyattr=key, autofill=False)
         roles = self.temp_roles.render(roles=self.roles.flatten, graph=self.roles.graph, graph_js=graph_js, roles_js=roles_js, current_roles=user_roles)
         return self.temp_modify.render(form=form, roles=roles, is_admin=is_admin, notification=notification, standalone_groups=user_lonely_groups)
 
@@ -903,5 +903,5 @@
             params = self._parse_params(params)
             self._selfmodify(params)
         user_attrs = self._get_user(user)
-        form = self.temp_form.render(attributes=self.attributes.get_selfattributes(), values=user_attrs, modify=True)
+        form = self.temp_form.render(attributes=self.attributes.get_selfattributes(), values=user_attrs, modify=True, autofill=False)
         return self.temp_selfmodify.render(form=form, is_admin=is_admin)
diff --git a/resources/templates/form.tmpl b/resources/templates/form.tmpl
index 1fde0c7..50db61f 100644
--- a/resources/templates/form.tmpl
+++ b/resources/templates/form.tmpl
@@ -74,6 +74,7 @@
 ${form_col(lc2)}
 </div>
 </div>
+% if autofill:
 <%
 from sets import Set
 attr_set = Set([])
@@ -118,3 +119,4 @@
 };
 % endfor
 </script>
+% endif