diff --git a/src/main/webapp/users.jsp b/src/main/webapp/users.jsp
index e26a86e..9ced52f 100644
--- a/src/main/webapp/users.jsp
+++ b/src/main/webapp/users.jsp
@@ -14,23 +14,42 @@
     		<a href="${newuserurl}" class="btn btn-default pull-right additional-space-bottom"><fmt:message key="users.create"/></a>
     	</div>
 		<table class="table table-hover">
-			<tr><th><fmt:message key="users.column.login"/></th><th><fmt:message key="users.column.firstname"/></th><th><fmt:message key="users.column.lastname"/></th><th><fmt:message key="users.column.groups"/></th><th><fmt:message key="users.column.operations"/></th></tr>
+			<tr>
+				<th><fmt:message key="users.column.login"/></th>
+				<th><fmt:message key="users.column.firstname"/></th>
+				<th><fmt:message key="users.column.lastname"/></th>
+				<th colspan="2"><fmt:message key="users.column.groups"/></th>
+				<th><fmt:message key="users.column.operations"/></th>
+			</tr>
 			<c:forEach items="${users}" var="userentry">
 				<tr>
-					<td>${userentry.value.login}</td>
+					<c:url var="upduserurl" value="/user/${userentry.key}?op=edit"/>
+					<td><a href="${upduserurl}">${userentry.value.login}</a></td>
+					
 					<td>${userentry.value.firstname}</td>
 					<td>${userentry.value.lastname}</td>
+					
 					<td>
-						<ul>
 						<c:forEach items="${userentry.value.groups}" var="groupdn">
 							<c:url var="groupurl" value="/group/${groupdn}"/>
-							<li><a href="${groupurl}">${groups[groupdn].name}</a></li>
+							<c:if test="${ groups[groupdn].name eq 'login' }">
+								<a href="${groupurl}">${groups[groupdn].name}</a>
+							</c:if>
 						</c:forEach>
 						</ul>
 					</td>
-					<c:url var="upduserurl" value="/user/${userentry.key}?op=edit"/>
+					<td>
+						<c:forEach items="${userentry.value.groups}" var="groupdn">
+							<c:url var="groupurl" value="/group/${groupdn}"/>
+							<c:if test="${ groups[groupdn].name ne 'login' }">
+								<a href="${groupurl}">${groups[groupdn].name}</a><br/>
+							</c:if>
+						</c:forEach>
+						</ul>
+					</td>
+					
 					<c:url var="deluserurl" value="/user/${userentry.key}?op=delete"/>
-					<td><a href="${upduserurl}"><fmt:message key="users.operations.edit"/></a> <a href="${deluserurl}"><fmt:message key="users.operations.delete"/></a></td>
+					<td><a href="${deluserurl}"><fmt:message key="users.operations.delete"/></a></td>
 				</tr>
 			</c:forEach>
 		</table>