=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java	2013-12-18 12:58:19 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/user/hibernate/HibernateUserCredentialsStore.java	2013-12-18 13:03:23 +0000
@@ -90,7 +90,8 @@
 
         User persistedUser = userService.getUser( userCredentials.getUser().getUid() );
 
-        if ( !persistedUser.getUserCredentials().getPassword().equals( userCredentials.getPassword() ) )
+        if ( persistedUser != null && persistedUser.getUserCredentials() != null
+            && !persistedUser.getUserCredentials().getPassword().equals( userCredentials.getPassword() ) )
         {
             userCredentials.setPasswordLastUpdated( new Date() );
         }