=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java	2012-10-29 14:34:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/DefaultSecurityService.java	2012-10-29 14:56:41 +0000
@@ -164,6 +164,10 @@
         
         credentials.setPassword( newPassword );
         
+        credentials.setRestoreCode( null );
+        credentials.setRestoreToken( null );
+        credentials.setRestoreExpiry( null );
+        
         userService.updateUserCredentials( credentials );
         
         return true;