diff --git a/src/main/webapp/user.jsp b/src/main/webapp/user.jsp
index 6d60113..a35348e 100644
--- a/src/main/webapp/user.jsp
+++ b/src/main/webapp/user.jsp
@@ -117,8 +117,8 @@
 							<label for="password" class="col-sm-3 control-label"><fmt:message key="users.label.password"/></label> 
 							<div class="col-sm-9">
 								<input
-									type="password" autocomplete="new-password" class="form-control" id="password" name="password"
-									value="" placeholder="Enter password" >
+									type="password" class="form-control" id="password" name="password"
+									value="" placeholder="Enter password" autofocus>
 							</div>
 						</div>
 						<div class="form-group">
@@ -134,31 +134,13 @@
 						<div class="form-group">
 							<label for="membership" class="col-sm-3 control-label"><fmt:message key="users.label.memberof"/></label> 
 							<div class="col-sm-9" id ="membership">
-								<jsp:useBean id="checker" class="de.jalin.ldapadmin.beans.MembershipCheck" />
 								<c:forEach items="${groups}" var="groupentry" >
-									<jsp:setProperty property="user" name="checker" value="${user}" />
-									<jsp:setProperty property="group" name="checker" value="${groupentry.value}" />
-									<c:if test="${ not empty checker.checked }">
-										<div class="checkbox">
-											<label>
-												<input type="checkbox" id="${groupentry.value.name}" name="check_group_${groupentry.value.name}" ${checker.checked}>${groupentry.value.name}
-											</label>
-										</div>
-									</c:if>
-								</c:forEach>
-										<div class="checkbox">
-											------------------------------------------------------------------------------------------------
-										</div>
-								<c:forEach items="${groups}" var="groupentry" >
-									<jsp:setProperty property="user" name="checker" value="${user}" />
-									<jsp:setProperty property="group" name="checker" value="${groupentry.value}" />
-									<c:if test="${ empty checker.checked }">
-										<div class="checkbox">
-											<label>
-												<input type="checkbox" id="${groupentry.value.name}" name="check_group_${groupentry.value.name}" ${checker.checked}>${groupentry.value.name}
-											</label>
-										</div>
-									</c:if>
+									<div class="checkbox">
+										<jsp:useBean id="checker" class="de.jalin.ldapadmin.beans.MembershipCheck" />
+										<jsp:setProperty property="user" name="checker" value="${user}" />
+										<jsp:setProperty property="group" name="checker" value="${groupentry.value}" />
+										<label><input type="checkbox" id="${groupentry.value.name}" name="check_group_${groupentry.value.name}" ${checker.checked}>${groupentry.value.name}</label>
+									</div>
 								</c:forEach>
 							</div>
 						</div>