=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 06:44:19 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml	2014-07-07 08:05:58 +0000
@@ -111,7 +111,7 @@
   </bean>
   
   <bean id="fixedSaltGenerator" class="org.jasypt.salt.StringFixedSaltGenerator">
-    <constructor-arg><value>H7g0oLkEw3wf52fs52g3hbG</value></constructor-arg>
+    <constructor-arg type="java.lang.String" value="H7g0oLkEw3wf52fs52g3hbG" />
   </bean>
   
 </beans>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2014-07-07 06:44:19 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2014-07-07 08:05:58 +0000
@@ -246,7 +246,6 @@
                 .getPeriodTypeByName( infrastructuralPeriodType ).getClass() ) );
         }
         
-        configuration.setRemoteServerPassword( "abc" );
         configurationService.setConfiguration( configuration );
 
         message = i18n.getString( "settings_updated" );