Added roles
Delete emailToken once the account is activated
Added role-combobox to dashboard