=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2012-11-15 14:46:52 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/user/CurrentUserController.java 2012-11-15 14:48:27 +0000 @@ -210,7 +210,7 @@ currentUser.setJobTitle( userAccount.getJobTitle() ); currentUser.setGender( userAccount.getGender() ); - if ( userAccount.getBirthday() != null ) + if ( userAccount.getBirthday() != null && userAccount.getBirthday().isEmpty() ) { currentUser.setBirthday( simpleDateFormat.parse( userAccount.getBirthday() ) ); }