=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	2015-12-08 19:36:21 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserSettingKey.java	2015-12-30 14:43:57 +0000
@@ -32,8 +32,6 @@
 import java.util.Locale;
 import java.util.Optional;
 
-import org.hisp.dhis.setting.SettingKey;
-
 /**
  * @author Lars Helge Overland
  */
@@ -86,9 +84,9 @@
     // Logic
     // -------------------------------------------------------------------------
 
-    public static Optional<SettingKey> getByName( String name )
+    public static Optional<UserSettingKey> getByName( String name )
     {
-        for ( SettingKey setting : SettingKey.values() )
+        for ( UserSettingKey setting : UserSettingKey.values() )
         {
             if ( setting.getName().equals( name ) )
             {
@@ -101,7 +99,7 @@
 
     public static Serializable getAsRealClass( String name, String value )
     {
-        Optional<SettingKey> setting = getByName( name );
+        Optional<UserSettingKey> setting = getByName( name );
                 
         if ( setting.isPresent() )
         {