anchor.diff:          </td>
       </tr>
       </c:when>
  -    <c:when test="${not empty user.username}">
  +    <c:when test="${not empty user.userName}">
       <tr>
           <th>
               <Gemma:label key="user.roles"/>
           </th>
           <td>
  -        <c:forEach var="role" items="${user.roleList}" varStatus="status">
  -            <c:out value="${role.label}"/><c:if test="${!status.last}">,</c:if>
  -            <input type="hidden" name="userRoles" 
  -                value="<c:out value="${role.label}"/>" />
  +        <%--<c:forEach var="role" items="${user.roleList}" varStatus="status">--%>
  +        <c:forEach var="role" items="${user.userRoles}" varStatus="status">
  +            <%--<c:out value="${role.label}"/><c:if test="${!status.last}">,</c:if>--%>
  +            <c:out value="${role.userName}"/><c:if test="${!status.last}">,</c:if>
  +            <%--<input type="hidden" name="userRoles" --%>
  +                <%--value="<c:out value="${role.label}"/>" />--%>
  +            <input type="hidden" name="userRoles"     
  +                value="<c:out value="${role.userName}"/>" />
           </c:forEach>
           </td>
       </tr>
  
positive.code: </c:set>
      <tr>
          <th>
              <Gemma:label key="user.username"/>
          </th>
          <td>
          <spring:bind path="user.username">
          <c:choose>
              <c:when test="${empty user.username}">
                  <input type="text" name="username" value="<c:out value="${status.value}"/>" id="username"/>
                  <span class="fieldError"><c:out value="${status.errorMessage}"/></span>
              </c:when>
              <c:otherwise>
                  <c:out value="${user.username}"/>
                  <input type="hidden" name="username" value="<c:out value="${status.value}"/>" id="username"/>
              </c:otherwise>
          </c:choose>
          </spring:bind>
  
negative.code:             </spring:bind>
          </td>
      </tr>
      <%--
      <tr>
          <th>
              <Gemma:label key="user.address.address"/>
  