diff --git a/account-ui/src/main/webapp/web/accounts.xhtml b/account-ui/src/main/webapp/web/accounts.xhtml
index 9ba4dae..4db1737 100644
--- a/account-ui/src/main/webapp/web/accounts.xhtml
+++ b/account-ui/src/main/webapp/web/accounts.xhtml
@@ -1,341 +1,341 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:ui="http://java.sun.com/jsf/facelets"
-                xmlns:p="http://primefaces.org/ui"
-                template="/resources/template/template.xhtml"
-                xmlns:h="http://xmlns.jcp.org/jsf/html"
-                xmlns:f="http://xmlns.jcp.org/jsf/core"
-                xmlns:co="http://java.sun.com/jsf/composite/composite"
-                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
-                xmlns:o="http://omnifaces.org/ui"
-                xmlns:composite="http://xmlns.jcp.org/jsf/composite/composite"
-                xmlns:shiro="http://shiro.apache.org/tags">
-
-    <ui:define name="title">
-        Account Overview
-    </ui:define>
-
-    <ui:define name="description">
-        for #{applicationView.currentApplication.applicationName}
-    </ui:define>
-
-    <ui:define name="body">
-        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
-            <h:form id="accountForm" prependId="false">           
-                <p:dataTable id="accountTable" value="#{accountView.accounts}" var="account" rowKey="#{account.username}" selectionMode="single" selection="#{accountView.currentAccount}"
-                             styleClass="box-primary">
-                    <p:ajax event="rowSelect" update="buttonPanel" listener="#{accountView.selectAccount}" />
-                    <p:ajax event="rowUnselect" update="buttonPanel" listener="#{accountView.unselectAccount}"  />
-                    <p:column headerText="Username">
-                        <h:outputText value="#{account.username}" />
-                    </p:column>
-                    <p:column headerText="Lastname">
-                        <h:outputText value="#{account.lastname}" />
-                    </p:column>
-                    <p:column headerText="Firstname">
-                        <h:outputText value="#{account.firstname}" />
-                    </p:column>
-                    <p:column headerText="Email">
-                        <h:outputText value="#{account.emailaddress}" />
-                    </p:column>
-                    <p:column headerText="Status">
-                        <h:outputText value="#{account.status}" />
-                    </p:column>
-                    <p:column headerText="Can login" >
-                        <p:selectBooleanCheckbox id="canLogin" disabled="true" value="#{!empty account.accountLogin}" />
-                    </p:column>                
-                    <p:column headerText="CreatedOn">
-                        <h:outputText value="#{account.createdOn}" >
-                            <f:convertDateTime type="both" dateStyle="full" timeStyle="short" timeZone="Europe/Berlin"/>
-                        </h:outputText>
-                    </p:column>
-                    <p:column headerText="CreatedBy">
-                        <h:outputText value="#{account.createdBy}" />
-                    </p:column>
-                    <p:column headerText="LastUpdatedOn">                    
-                        <h:outputText value="#{account.lastUpdatedOn}">
-                            <f:convertDateTime type="both" dateStyle="full" timeStyle="short" timeZone="Europe/Berlin"/>
-                        </h:outputText>
-                    </p:column>
-                    <p:column headerText="LastUpdatedBy">
-                        <h:outputText value="#{account.lastUpdatedBy}" />
-                    </p:column>   
-                </p:dataTable>
-
-                <p:spacer height="10px" />
-                <p:panel id="buttonPanel" styleClass="box-primary"  style="margin-bottom:20px">
-                    <div class="ui-g ui-fluid">
-
-                        <shiro:hasPermission name="#{permissionConstants.accountDelete}">
-                            <div class="col-sm-12 col-md-4" style="margin-top:10px">
-                                <div class="ui-inputgroup" >
-                                    <h:outputLabel for="includeDisabledCheckbox" value="Include disabled accounts?" />
-                                    <p:inputSwitch id="includeDisabledCheckbox" value="#{accountView.showDisabledAccounts}" styleClass="btn-teal btn-block"  >
-                                        <p:ajax listener="#{accountView.showDisabledAccountsChange}" update="accountTable" />
-                                    </p:inputSwitch>
-                                </div>
-                            </div>
-                        </shiro:hasPermission>
-
-                        <shiro:hasPermission name="#{permissionConstants.accountAdd}">
-                            <div class="col-sm-12 col-md-2">
-                                <p:commandButton value="New" id="newButton" icon="fa fa-plus" 
-                                                 update="editDialog" oncomplete="PF('editDialogVar').show();"
-                                                 actionListener="#{accountView.newAccount}" styleClass="btn-primary btn-block" />
-                            </div>
-                        </shiro:hasPermission>
-
-                        <shiro:hasPermission name="#{permissionConstants.accountEdit}">
-                            <div class="col-sm-12 col-md-2">
-                                <p:commandButton value="Edit" id="editButton" icon="fa fa-pencil" 
-                                                 update="editDialog" oncomplete="PF('editDialogVar').show();"
-                                                 actionListener="#{accountView.editAccount}" disabled="#{!accountView.accountSelected}" styleClass="btn-teal btn-block" />
-                            </div>                    
-                        </shiro:hasPermission>
-
-                        <shiro:hasPermission name="#{permissionConstants.accountDelete}">
-                            <div class="col-sm-12 col-md-2">
-                                <p:commandButton value="Delete" id="deleteButton" icon="fa fa-trash-o"
-                                                 update=":accountForm:accountTable" action="#{accountView.deleteAccount}" disabled="#{accountView.accountSelected eq false or accountView.currentLoggedInUser eq true}" styleClass="btn-danger btn-block">
-                                    <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
-                                </p:commandButton>
-                            </div>
-                        </shiro:hasPermission>
-
-                        <shiro:hasPermission name="#{permissionConstants.accountsCombined}">                        
-                            <div class="col-sm-12 col-md-2">
-                                <shiro:hasPermission name="#{permissionConstants.accountLoginAdd}">                        
-                                    <c:if test="#{empty accountView.currentAccount.accountLogin}">
-                                        <p:commandButton value="Add login" id="addLoginButton" icon="fa fa-plus" disabled="#{!accountView.accountSelected}"
-                                                         update="editLoginDialog" oncomplete="PF('editLoginDialogVar').show();"
-                                                         action="#{accountView.addAccountLogin}" styleClass="btn-teal btn-block">
-                                        </p:commandButton>
-                                    </c:if>
-                                </shiro:hasPermission>
-
-                                <c:if test="#{!empty accountView.currentAccount.accountLogin}">
-                                    <p:splitButton value="Edit login" id="editLoginButton" icon="fa fa-pencil" disabled="#{!accountView.accountSelected}" styleClass="btn-success btn-block">
-
-                                        <shiro:hasPermission name="#{permissionConstants.accountLoginEdit}">                        
-                                            <p:menuitem value="Edit login" icon="fa fa-pencil" disabled="#{!accountView.accountSelected}"
-                                                        update="editLoginDialog" oncomplete="PF('editLoginDialogVar').show();"
-                                                        action="#{accountView.editAccountLogin}" >                                                                                        
-                                            </p:menuitem>
-                                        </shiro:hasPermission>
-
-
-                                        <shiro:hasPermission name="#{permissionConstants.accountLoginDelete}">                        
-                                            <p:menuitem value="Delete login" icon="fa fa-trash-o"  disabled="#{accountView.currentLoggedInUser}"
-                                                        update="accountTable,buttonPanel" styleClass="btn-danger btn-block"
-                                                        action="#{accountView.deleteAccountLogin}" >
-                                                <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
-                                            </p:menuitem>
-                                        </shiro:hasPermission>
-
-                                    </p:splitButton>                        
-                                </c:if>
-                            </div>
-                        </shiro:hasPermission>
-                    </div>                    
-                </p:panel>
-
-
-
-                <composite:confirmationDialog />
-            </h:form>
-        </p:panel>
-
-
-        <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"
-                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
-            <h:form id="editDialogForm">
-                <p:messages id="editDialogMessages" showDetail="true" showIcon="true" showSummary="true">
-                    <p:autoUpdate />
-                </p:messages>
-
-                <div class="ui-g ui-fluid">
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="username" value="Username" />   
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <c:if test="#{accountView.currentAccount.createdBy != null}">
-                            <h:outputText id="username" value="#{accountView.currentAccount.username}" />
-                        </c:if>
-                        <c:if test="#{accountView.currentAccount.createdBy == null}">
-                            <p:inputText id="username" value="#{accountView.currentAccount.username}" />
-                        </c:if>
-                    </div>
-                    <div class="col-sm-12 col-md-3">                        
-                        <p:message for="username"><p:autoUpdate /></p:message>
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="lastname" value="Lastname" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">                    
-                        <p:inputText id="lastname" value="#{accountView.currentAccount.lastname}" size="40" maxlength="100"/>
-                    </div>
-                    <div class="col-sm-12 col-md-3  ">                    
-                        <p:message for="lastname"> <p:autoUpdate /></p:message>
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">                    
-                        <p:outputLabel for="firstname" value="Firstname" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:inputText id="firstname" value="#{accountView.currentAccount.firstname}" size="40" maxlength="100" />
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:message for="firstname"> <p:autoUpdate /></p:message>
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="emailaddress" value="emailaddress" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">                    
-                        <p:inputText id="emailaddress" value="#{accountView.currentAccount.emailaddress}" size="40" maxlength="200">
-                            <f:validator validatorId="de.muehlencord.shared.jeeutil.validator.EmailValidator" />
-                        </p:inputText>
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:message for="emailaddress"> <p:autoUpdate /></p:message>
-                    </div>
-
-                    <c:if test="#{accountView.currentAccount.username != null}">                
-
-                        <div class="col-sm-12 col-md-3">
-                            <p:outputLabel for="status" value="Status" />
-                        </div>
-                        <div class="col-sm-12 col-md-6">
-                            <p:selectOneMenu id="status" value="#{accountView.currentAccount.status}" >
-                                <f:selectItems value="#{accountView.statusList}" />
-                            </p:selectOneMenu>
-                        </div>
-                        <div class="col-sm-12 col-md-3">
-                            <p:message for="status" />                
-                        </div>
-
-                        <div class="col-sm-12 col-md-3">
-                            <p:outputLabel for="createdon" value="Created on" />
-                        </div>
-                        <div class="col-sm-12 col-md-6">                        
-                            <h:outputText id="createdon" value="#{accountView.currentAccount.createdOn}" />
-                        </div>
-                        <div class="col-sm-12 col-md-3">                        
-                            <p:message for="createdon" />
-                        </div>
-
-                        <div class="col-sm-12 col-md-3">
-                            <p:outputLabel for="createdby" value="Created by" />
-                        </div>
-                        <div class="col-sm-12 col-md-6">                        
-                            <h:outputText id="createdby" value="#{accountView.currentAccount.createdBy}" />
-                        </div>
-                        <div class="col-sm-12 col-md-3">                        
-                            <p:message for="createdby" />
-                        </div>
-
-                        <div class="col-sm-12 col-md-3">
-                            <p:outputLabel for="lastupdatedon" value="Last updated on" />
-                        </div>
-                        <div class="col-sm-12 col-md-6">                        
-                            <h:outputText id="lastupdatedon" value="#{accountView.currentAccount.lastUpdatedOn}" />
-                        </div>
-                        <div class="col-sm-12 col-md-3">                        
-                            <p:message for="lastupdatedon" />
-                        </div>
-
-                        <div class="col-sm-12 col-md-3">
-                            <p:outputLabel for="lastupdatedby" value="Last updated by" />
-                        </div>
-                        <div class="col-sm-12 col-md-6">
-                            <h:outputText id="lastupdatedby" value="#{accountView.currentAccount.lastUpdatedBy}" />
-                        </div>
-                        <div class="col-sm-12 col-md-3">                        
-                            <p:message for="lastupdatedby" />
-                        </div>
-                    </c:if>
-
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="roles" value="Roles" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:selectManyMenu id="roles" var="role" label="#{role.roleName}" value="#{accountView.currentAccountRoles}" converter="omnifaces.SelectItemsConverter" required="false" >
-                            <f:selectItems value="#{accountView.allApplicationRoles}" var="roleItem" itemValue="#{roleItem}" />
-                            <p:column>
-                                <h:outputText value="#{role.application.applicationName}-#{role.roleName}"/>
-                            </p:column>
-                        </p:selectManyMenu>
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:message for="roles" />
-                    </div>
-
-
-                    <div class="col-sm-12 col-md-6">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Save" action="#{accountView.saveEditAccount}" styleClass="btn-primary btn-block" 
-                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editDialogVar').hide();" update=":accountForm:accountTable" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Cancel" action="#{accountView.cancelEditAccount}" immediate="true" styleClass="btn-teal btn-block"
-                                         oncomplete="PF('editDialogVar').hide();" />
-                    </div>
-                </div>
-            </h:form>
-        </p:dialog>
-
-        <p:dialog id="editLoginDialog" widgetVar="editLoginDialogVar" header="Edit account login" width="600"
-                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
-            <h:form id="editLoginDialogForm">
-                <p:messages id="editLoginDialogMessages" showDetail="true" showIcon="true" showSummary="true">
-                    <p:autoUpdate />
-                </p:messages>
-
-                <div class="ui-g ui-fluid">
-                    <o:validateMultiple id="myId" components="password repeatPassword" 
-                                        validator="#{accountView.validatePasswords}" message="#{msgs.passwords_different}" />
-
-                    <div class="col-sm-12">
-                        <p:outputLabel value="Enter a new password or keep values empty to keep existing / autogenrated value" />
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="password" value="Password" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:password id="password" value="#{accountView.password}" maxlength="32" size="32" required="false"/>
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:message for="password" />                
-                    </div>
-
-                    <div class="col-sm-12 col-md-3">
-                        <p:outputLabel for="repeatPassword" value="repeat Password" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:password id="repeatPassword" value="#{accountView.repeatPassword}" maxlength="32" size="32" required="false"/>
-                    </div>
-                    <div class="col-sm-12 col-md-3">
-                        <p:message for="repeatPassword" />                
-                    </div>                                    
-
-                    <div class="col-sm-12 col-md-6">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Save" action="#{accountView.saveEditAccountLogin}" styleClass="btn-primary btn-block" 
-                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editLoginDialogVar').hide();" update=":accountForm:accountTable,:accountForm:buttonPanel" />
-                    </div>
-                    <div class="col-sm-12 col-md-6">
-                        <p:spacer height="10px" />
-                        <p:commandButton value="Cancel" action="#{accountView.cancelEditAccountLogin}" immediate="true" styleClass="btn-teal btn-block"
-                                         oncomplete="PF('editLoginDialogVar').hide();" />
-                    </div>
-                </div>
-            </h:form>
-        </p:dialog>
-
-    </ui:define>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                template="/resources/template/template.xhtml"
+                xmlns:h="http://xmlns.jcp.org/jsf/html"
+                xmlns:f="http://xmlns.jcp.org/jsf/core"
+                xmlns:co="http://java.sun.com/jsf/composite/composite"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                xmlns:o="http://omnifaces.org/ui"
+                xmlns:composite="http://xmlns.jcp.org/jsf/composite/composite"
+                xmlns:shiro="http://shiro.apache.org/tags">
+
+    <ui:define name="title">
+        Account Overview
+    </ui:define>
+
+    <ui:define name="description">
+        for #{applicationView.currentApplication.applicationName}
+    </ui:define>
+
+    <ui:define name="body">
+        <p:panel styleClass="box-solid" rendered="#{! empty applicationView.currentApplication}">
+            <h:form id="accountForm" prependId="false">           
+                <p:dataTable id="accountTable" value="#{accountView.accounts}" var="account" rowKey="#{account.username}" selectionMode="single" selection="#{accountView.currentAccount}"
+                             styleClass="box-primary">
+                    <p:ajax event="rowSelect" update="buttonPanel" listener="#{accountView.selectAccount}" />
+                    <p:ajax event="rowUnselect" update="buttonPanel" listener="#{accountView.unselectAccount}"  />
+                    <p:column headerText="Username">
+                        <h:outputText value="#{account.username}" />
+                    </p:column>
+                    <p:column headerText="Lastname">
+                        <h:outputText value="#{account.lastname}" />
+                    </p:column>
+                    <p:column headerText="Firstname">
+                        <h:outputText value="#{account.firstname}" />
+                    </p:column>
+                    <p:column headerText="Email">
+                        <h:outputText value="#{account.emailaddress}" />
+                    </p:column>
+                    <p:column headerText="Status">
+                        <h:outputText value="#{account.status}" />
+                    </p:column>
+                    <p:column headerText="Can login" >
+                        <p:selectBooleanCheckbox id="canLogin" disabled="true" value="#{!empty account.accountLogin}" />
+                    </p:column>                
+                    <p:column headerText="CreatedOn">
+                        <h:outputText value="#{account.createdOn}" >
+                            <f:convertDateTime type="both" dateStyle="full" timeStyle="short" timeZone="Europe/Berlin"/>
+                        </h:outputText>
+                    </p:column>
+                    <p:column headerText="CreatedBy">
+                        <h:outputText value="#{account.createdBy}" />
+                    </p:column>
+                    <p:column headerText="LastUpdatedOn">                    
+                        <h:outputText value="#{account.lastUpdatedOn}">
+                            <f:convertDateTime type="both" dateStyle="full" timeStyle="short" timeZone="Europe/Berlin"/>
+                        </h:outputText>
+                    </p:column>
+                    <p:column headerText="LastUpdatedBy">
+                        <h:outputText value="#{account.lastUpdatedBy}" />
+                    </p:column>   
+                </p:dataTable>
+
+                <p:spacer height="10px" />
+                <p:panel id="buttonPanel" styleClass="box-primary"  style="margin-bottom:20px">
+                    <div class="ui-g ui-fluid">
+
+                        <shiro:hasPermission name="#{permissionConstants.accountDelete}">
+                            <div class="col-sm-12 col-md-4" style="margin-top:10px">
+                                <div class="ui-inputgroup" >
+                                    <h:outputLabel for="includeDisabledCheckbox" value="Include disabled accounts?" />
+                                    <p:inputSwitch id="includeDisabledCheckbox" value="#{accountView.showDisabledAccounts}" styleClass="btn-teal btn-block"  >
+                                        <p:ajax listener="#{accountView.showDisabledAccountsChange}" update="accountTable" />
+                                    </p:inputSwitch>
+                                </div>
+                            </div>
+                        </shiro:hasPermission>
+
+                        <shiro:hasPermission name="#{permissionConstants.accountAdd}">
+                            <div class="col-sm-12 col-md-2">
+                                <p:commandButton value="New" id="newButton" icon="fa fa-plus" 
+                                                 update="editDialog" oncomplete="PF('editDialogVar').show();"
+                                                 actionListener="#{accountView.newAccount}" styleClass="btn-primary btn-block" />
+                            </div>
+                        </shiro:hasPermission>
+
+                        <shiro:hasPermission name="#{permissionConstants.accountEdit}">
+                            <div class="col-sm-12 col-md-2">
+                                <p:commandButton value="Edit" id="editButton" icon="fa fa-pencil" 
+                                                 update="editDialog" oncomplete="PF('editDialogVar').show();"
+                                                 actionListener="#{accountView.editAccount}" disabled="#{!accountView.accountSelected}" styleClass="btn-teal btn-block" />
+                            </div>                    
+                        </shiro:hasPermission>
+
+                        <shiro:hasPermission name="#{permissionConstants.accountDelete}">
+                            <div class="col-sm-12 col-md-2">
+                                <p:commandButton value="Delete" id="deleteButton" icon="fa fa-trash-o"
+                                                 update=":accountForm:accountTable" action="#{accountView.deleteAccount}" disabled="#{accountView.accountSelected eq false or accountView.currentLoggedInUser eq true}" styleClass="btn-danger btn-block">
+                                    <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
+                                </p:commandButton>
+                            </div>
+                        </shiro:hasPermission>
+
+                        <shiro:hasAnyPermission name="#{permissionConstants.accountsCombined}">                        
+                            <div class="col-sm-12 col-md-2">
+                                <shiro:hasPermission name="#{permissionConstants.accountLoginAdd}">                        
+                                    <c:if test="#{empty accountView.currentAccount.accountLogin}">
+                                        <p:commandButton value="Add login" id="addLoginButton" icon="fa fa-plus" disabled="#{!accountView.accountSelected}"
+                                                         update="editLoginDialog" oncomplete="PF('editLoginDialogVar').show();"
+                                                         action="#{accountView.addAccountLogin}" styleClass="btn-teal btn-block">
+                                        </p:commandButton>
+                                    </c:if>
+                                </shiro:hasPermission>
+
+                                <c:if test="#{!empty accountView.currentAccount.accountLogin}">
+                                    <p:splitButton value="Edit login" id="editLoginButton" icon="fa fa-pencil" disabled="#{!accountView.accountSelected}" styleClass="btn-success btn-block">
+
+                                        <shiro:hasPermission name="#{permissionConstants.accountLoginEdit}">                        
+                                            <p:menuitem value="Edit login" icon="fa fa-pencil" disabled="#{!accountView.accountSelected}"
+                                                        update="editLoginDialog" oncomplete="PF('editLoginDialogVar').show();"
+                                                        action="#{accountView.editAccountLogin}" >                                                                                        
+                                            </p:menuitem>
+                                        </shiro:hasPermission>
+
+
+                                        <shiro:hasPermission name="#{permissionConstants.accountLoginDelete}">                        
+                                            <p:menuitem value="Delete login" icon="fa fa-trash-o"  disabled="#{accountView.currentLoggedInUser}"
+                                                        update="accountTable,buttonPanel" styleClass="btn-danger btn-block"
+                                                        action="#{accountView.deleteAccountLogin}" >
+                                                <p:confirm header="Confirmation" message="Are you sure?" icon="fa fa-exclamation-triangle" />
+                                            </p:menuitem>
+                                        </shiro:hasPermission>
+
+                                    </p:splitButton>                        
+                                </c:if>
+                            </div>
+                        </shiro:hasAnyPermission>>
+                    </div>                    
+                </p:panel>
+
+
+
+                <composite:confirmationDialog />
+            </h:form>
+        </p:panel>
+
+
+        <p:dialog id="editDialog" widgetVar="editDialogVar" header="Edit account" width="600"
+                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
+            <h:form id="editDialogForm">
+                <p:messages id="editDialogMessages" showDetail="true" showIcon="true" showSummary="true">
+                    <p:autoUpdate />
+                </p:messages>
+
+                <div class="ui-g ui-fluid">
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="username" value="Username" />   
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <c:if test="#{accountView.currentAccount.createdBy != null}">
+                            <h:outputText id="username" value="#{accountView.currentAccount.username}" />
+                        </c:if>
+                        <c:if test="#{accountView.currentAccount.createdBy == null}">
+                            <p:inputText id="username" value="#{accountView.currentAccount.username}" />
+                        </c:if>
+                    </div>
+                    <div class="col-sm-12 col-md-3">                        
+                        <p:message for="username"><p:autoUpdate /></p:message>
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="lastname" value="Lastname" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">                    
+                        <p:inputText id="lastname" value="#{accountView.currentAccount.lastname}" size="40" maxlength="100"/>
+                    </div>
+                    <div class="col-sm-12 col-md-3  ">                    
+                        <p:message for="lastname"> <p:autoUpdate /></p:message>
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">                    
+                        <p:outputLabel for="firstname" value="Firstname" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:inputText id="firstname" value="#{accountView.currentAccount.firstname}" size="40" maxlength="100" />
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:message for="firstname"> <p:autoUpdate /></p:message>
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="emailaddress" value="emailaddress" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">                    
+                        <p:inputText id="emailaddress" value="#{accountView.currentAccount.emailaddress}" size="40" maxlength="200">
+                            <f:validator validatorId="de.muehlencord.shared.jeeutil.validator.EmailValidator" />
+                        </p:inputText>
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:message for="emailaddress"> <p:autoUpdate /></p:message>
+                    </div>
+
+                    <c:if test="#{accountView.currentAccount.username != null}">                
+
+                        <div class="col-sm-12 col-md-3">
+                            <p:outputLabel for="status" value="Status" />
+                        </div>
+                        <div class="col-sm-12 col-md-6">
+                            <p:selectOneMenu id="status" value="#{accountView.currentAccount.status}" >
+                                <f:selectItems value="#{accountView.statusList}" />
+                            </p:selectOneMenu>
+                        </div>
+                        <div class="col-sm-12 col-md-3">
+                            <p:message for="status" />                
+                        </div>
+
+                        <div class="col-sm-12 col-md-3">
+                            <p:outputLabel for="createdon" value="Created on" />
+                        </div>
+                        <div class="col-sm-12 col-md-6">                        
+                            <h:outputText id="createdon" value="#{accountView.currentAccount.createdOn}" />
+                        </div>
+                        <div class="col-sm-12 col-md-3">                        
+                            <p:message for="createdon" />
+                        </div>
+
+                        <div class="col-sm-12 col-md-3">
+                            <p:outputLabel for="createdby" value="Created by" />
+                        </div>
+                        <div class="col-sm-12 col-md-6">                        
+                            <h:outputText id="createdby" value="#{accountView.currentAccount.createdBy}" />
+                        </div>
+                        <div class="col-sm-12 col-md-3">                        
+                            <p:message for="createdby" />
+                        </div>
+
+                        <div class="col-sm-12 col-md-3">
+                            <p:outputLabel for="lastupdatedon" value="Last updated on" />
+                        </div>
+                        <div class="col-sm-12 col-md-6">                        
+                            <h:outputText id="lastupdatedon" value="#{accountView.currentAccount.lastUpdatedOn}" />
+                        </div>
+                        <div class="col-sm-12 col-md-3">                        
+                            <p:message for="lastupdatedon" />
+                        </div>
+
+                        <div class="col-sm-12 col-md-3">
+                            <p:outputLabel for="lastupdatedby" value="Last updated by" />
+                        </div>
+                        <div class="col-sm-12 col-md-6">
+                            <h:outputText id="lastupdatedby" value="#{accountView.currentAccount.lastUpdatedBy}" />
+                        </div>
+                        <div class="col-sm-12 col-md-3">                        
+                            <p:message for="lastupdatedby" />
+                        </div>
+                    </c:if>
+
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="roles" value="Roles" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:selectManyMenu id="roles" var="role" label="#{role.roleName}" value="#{accountView.currentAccountRoles}" converter="omnifaces.SelectItemsConverter" required="false" >
+                            <f:selectItems value="#{accountView.allApplicationRoles}" var="roleItem" itemValue="#{roleItem}" />
+                            <p:column>
+                                <h:outputText value="#{role.application.applicationName}-#{role.roleName}"/>
+                            </p:column>
+                        </p:selectManyMenu>
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:message for="roles" />
+                    </div>
+
+
+                    <div class="col-sm-12 col-md-6">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Save" action="#{accountView.saveEditAccount}" styleClass="btn-primary btn-block" 
+                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editDialogVar').hide();" update=":accountForm:accountTable" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Cancel" action="#{accountView.cancelEditAccount}" immediate="true" styleClass="btn-teal btn-block"
+                                         oncomplete="PF('editDialogVar').hide();" />
+                    </div>
+                </div>
+            </h:form>
+        </p:dialog>
+
+        <p:dialog id="editLoginDialog" widgetVar="editLoginDialogVar" header="Edit account login" width="600"
+                  modal="true" appendTo="@(body)" showEffect="fade" hideEffect="fade" styleClass="box-solid box-primary" >            
+            <h:form id="editLoginDialogForm">
+                <p:messages id="editLoginDialogMessages" showDetail="true" showIcon="true" showSummary="true">
+                    <p:autoUpdate />
+                </p:messages>
+
+                <div class="ui-g ui-fluid">
+                    <o:validateMultiple id="myId" components="password repeatPassword" 
+                                        validator="#{accountView.validatePasswords}" message="#{msgs.passwords_different}" />
+
+                    <div class="col-sm-12">
+                        <p:outputLabel value="Enter a new password or keep values empty to keep existing / autogenrated value" />
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="password" value="Password" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:password id="password" value="#{accountView.password}" maxlength="32" size="32" required="false"/>
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:message for="password" />                
+                    </div>
+
+                    <div class="col-sm-12 col-md-3">
+                        <p:outputLabel for="repeatPassword" value="repeat Password" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:password id="repeatPassword" value="#{accountView.repeatPassword}" maxlength="32" size="32" required="false"/>
+                    </div>
+                    <div class="col-sm-12 col-md-3">
+                        <p:message for="repeatPassword" />                
+                    </div>                                    
+
+                    <div class="col-sm-12 col-md-6">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Save" action="#{accountView.saveEditAccountLogin}" styleClass="btn-primary btn-block" 
+                                         oncomplete="if (args &amp;&amp; !args.validationFailed) PF('editLoginDialogVar').hide();" update=":accountForm:accountTable,:accountForm:buttonPanel" />
+                    </div>
+                    <div class="col-sm-12 col-md-6">
+                        <p:spacer height="10px" />
+                        <p:commandButton value="Cancel" action="#{accountView.cancelEditAccountLogin}" immediate="true" styleClass="btn-teal btn-block"
+                                         oncomplete="PF('editLoginDialogVar').hide();" />
+                    </div>
+                </div>
+            </h:form>
+        </p:dialog>
+
+    </ui:define>
+
 </ui:composition>
\ No newline at end of file