diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
index bc2e135ee21b184ba6cc08b65ce1f264c77f686c..25ca99b446296785deaa2b8683a2ad46eba40c98 100755
--- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
+++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java
@@ -721,14 +721,18 @@ public class UserBean {
         }
     }
     
-    // TODO: Put in config file?
-    private final static String[] USER_COUNTRY_CODES = {"NO","SE","BA","LV","US"};
-    
     public List<Country> getUserCountries()
     {
-        return em.createNamedQuery("Country.findByCountryCodes")
-                .setParameter("countryCodes",Arrays.asList(UserBean.USER_COUNTRY_CODES))
-                .getResultList();
+        try
+        {
+            return em.createNamedQuery("Country.findByCountryCodes")
+                    .setParameter("countryCodes",Arrays.asList(System.getProperty("no.nibio.vips.logic.USER_COUNTRY_CODES").split(",")))
+                    .getResultList();
+        }
+        catch(NullPointerException ex)
+        {
+            return new ArrayList<>();
+        }
     }
 
     public List<OrganizationGroup> getOrganizationGroups(Organization organization) {