=== 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-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/DefaultUserSettingService.java	2016-01-05 19:38:32 +0000
@@ -210,7 +210,7 @@
 
         if ( userCredentials == null )
         {
-            return Optional.empty();
+            return Optional.ofNullable( key.getDefaultValue() );
         }
         
         UserSetting setting = userSettingStore.getUserSetting( userCredentials.getUserInfo(), key.getName() );