=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2016-01-07 08:13:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2016-01-07 08:42:19 +0000
@@ -163,9 +163,7 @@
 
         if ( NAME_KEY_MAP.containsKey( name ) && NAME_KEY_MAP.get( name ).isConfidential() )
         {
-
             setting.setValue( pbeStringEncryptor.decrypt( setting.getValue().toString() ) );
-
         }
 
         return setting != null && setting.hasValue() ? setting.getValue() : null;
@@ -207,21 +205,15 @@
         {
             return Optional.ofNullable( defaultValue );
         }
-
     }
 
     @Override
     public List<SystemSetting> getAllSystemSettings()
     {
-
-        /*
-         * Remove confidential settings from this list!
-         */
         return systemSettingStore.getAll().stream()
             .filter( systemSetting -> !NAME_KEY_MAP.containsKey( systemSetting.getName() ) ||
                 !NAME_KEY_MAP.get( systemSetting.getName() ).isConfidential() )
             .collect( Collectors.toList() );
-
     }
 
     @Override