diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index cfff66476042e9d1180477161823fe21b4489a7d..7e203f651d73b23aab4a29f1105e6eb0e0ec6a3c 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -1038,3 +1038,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
index 1afc139bfe76d5367aa934e00a138b4af2fb573c..bdcacc07ee8f68888eef846957c8b5ab77cf2667 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
@@ -1031,3 +1031,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
index 44987729cc137364253d4baed14b90d6d168d499..9e7aff9d91fb799362e1c06e51ff65a6dd382c48 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
@@ -1030,3 +1030,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index 9066a82ec8fc7476518cdfd69438631be26424bc..ff13d5946e81bc56d90a7d6dfff2842b1661163b 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -1039,3 +1039,4 @@ dd_upper=Maksimumstemperaturer d\u00f8gngradberegning
 observedPhase=Observert utviklingsstadium ved biofix-dato
 YSTEMBTEMP=Yellow Stemborer temperaturmodell
 addIllustration=Legg til illustrasjon
+allRoles=Alle roller
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
index fee3ba47efc49f20df1bf08dcabec1f8d873f8ce..1281432bf0ff57abecd1f195fc22a6c3b283cba2 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
@@ -1032,3 +1032,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index 778dbb652dbcaf8d46e4f39f05385da8d57ed831..fb0fbad23a3369f2a4b273ae5595d7ed1777da44 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -1025,3 +1025,4 @@ dd_upper=Day degree upper cutoffs
 observedPhase=Observed phase at biofix date
 YSTEMBTEMP=Yellow Stemborer Temperature Model
 addIllustration=Add illustration
+allRoles=All roles
diff --git a/src/main/webapp/templates/userList.ftl b/src/main/webapp/templates/userList.ftl
index 10a803d0cf249243b1b37816d357540210e6c15b..548e9455cad0598a81a536f5b9462a29f798e020 100755
--- a/src/main/webapp/templates/userList.ftl
+++ b/src/main/webapp/templates/userList.ftl
@@ -113,12 +113,12 @@
 	</p>
         <#if messageKey?has_content>
 		<div class="alert alert-success">${i18nBundle(messageKey)}</div>
-	</#if>
+	</#if>              
         <tr>
             <td>
                 <#if user.isSuperUser() || user.isOrganizationAdmin() >
                     <select onchange="<#if user.isSuperUser()>sortByOrgAndUserRole();<#else>sortByUserRole();</#if>" id="selectUserRole" class="form-control">
-                        <option value="-1">*Alle typer brukere</option>
+                        <option value="-1">${i18nBundle.allRoles}</option>
                         <#list vipsLogicRoles as role>
                             <option value="${role.vipsLogicRoleId}">${i18nBundle["vipsLogicRole_" + role.vipsLogicRoleId]}</option>
                         </#list>
@@ -127,7 +127,7 @@
             <br>
                 <#if user.isSuperUser() >
                     <select onclick="sortByOrgAndUserRole();" id="selectOrg" class="form-control">
-                        <option value="-1">*Alle organisasjoner</option>
+                        <option value="-1">${i18nBundle.allOrganizations}</option>
                         <#list organizations as org>
                             <option value=${org.organizationId}>${org.organizationName}</option>
                         </#list>  
@@ -141,8 +141,8 @@
 			<th>${i18nBundle.lastName}</th>
                         <th>${i18nBundle.firstName}</th>
 			<th>${i18nBundle.status}</th>
-                        <th>*Organisasjon</th>
-                        <th>*Roller</th>
+                        <th>${i18nBundle.organizationId}</th>
+                        <th>${i18nBundle.vipsLogicRoles}</th>
 		</thead>
 		<tbody>
                 <!-- The ones that need treatment first -->