=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/configuration/DefaultConfigurationService.java	2013-11-04 13:54:18 +0000
@@ -54,7 +54,14 @@
     @Override
     public void setConfiguration( Configuration configuration )
     {
-        configurationStore.save( configuration );
+        if ( configuration != null && configuration.getId() > 0 )
+        {
+            configurationStore.update( configuration );
+        }
+        else
+        {
+            configurationStore.save( configuration );
+        }
     }
     
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-10-30 23:36:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-11-04 13:54:18 +0000
@@ -889,6 +889,8 @@
             executeSql( "alter table reporttable drop column doperiods" );
             executeSql( "alter table reporttable drop column dounits" );
             executeSql( "alter table reporttable drop column categorycomboid" );
+            
+            executeSql( "delete from configuration where configurationid not in (select configurationid from configuration limit 1)" );
         }
         catch ( Exception ex )
         {