=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2016-03-13 14:11:35 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2016-03-13 14:27:28 +0000
@@ -216,19 +216,7 @@
             return new ArrayList<>();
         }
 
-        List<UserSetting> list = userSettingStore.getAllUserSettings( user );
-
-        return list.stream().map( userSetting -> {
-            if ( userSetting.getValue() == null )
-            {
-                return new UserSetting( userSetting.getUser(), userSetting.getName(),
-                    systemSettingManager.getSystemSetting( NAME_SETTING_KEY_MAP.get( userSetting.getName() ) ) );
-            }
-            else
-            {
-                return userSetting;
-            }
-        } ).collect( Collectors.toList() );
+        return userSettingStore.getAllUserSettings( user );
     }
 
     @Override
@@ -266,7 +254,6 @@
             {
                 return result;
             }
-
         }
         catch ( ExecutionException ignored )
         {