--- a/server/src/main/java/org/iri_research/renkan/models/User.java	Fri Nov 15 09:34:41 2013 +0100
+++ b/server/src/main/java/org/iri_research/renkan/models/User.java	Mon Nov 18 23:34:22 2013 +0100
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import org.iri_research.renkan.Constants;
-import org.joda.time.DateTime;
+import org.joda.time.LocalDate;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.security.core.GrantedAuthority;
@@ -24,12 +24,12 @@
     private String avatar;
     @Field("credentials_expiration_date")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
-    private DateTime credentialExpirationDate;
+    private LocalDate credentialExpirationDate;
     private String email;
     private boolean enabled;
     @Field("expiration_date")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ", timezone = "GMT")
-    private DateTime expirationDate;
+    private LocalDate expirationDate;
     private boolean locked;
     private String password;
     @Field("authorities")
@@ -66,7 +66,7 @@
         return this.color;
     }
 
-    public DateTime getCredentialExpirationDate() {
+    public LocalDate getCredentialExpirationDate() {
         return credentialExpirationDate;
     }
 
@@ -74,7 +74,7 @@
         return email;
     }
 
-    public DateTime getExpirationDate() {
+    public LocalDate getExpirationDate() {
         return expirationDate;
     }
 
@@ -102,7 +102,7 @@
     @Override
     public boolean isAccountNonExpired() {
         return this.expirationDate == null
-                || this.expirationDate.isAfterNow();
+                || this.expirationDate.isAfter(LocalDate.now());
     }
 
     @Override
@@ -113,7 +113,7 @@
     @Override
     public boolean isCredentialsNonExpired() {
         return this.credentialExpirationDate == null
-                || this.credentialExpirationDate.isAfterNow();
+                || this.credentialExpirationDate.isAfter(LocalDate.now());
     }
 
     @Override
@@ -129,7 +129,7 @@
         this.avatar = avatar;
     }
 
-    public void setCredentialExpirationDate(DateTime credentialExpirationDate) {
+    public void setCredentialExpirationDate(LocalDate credentialExpirationDate) {
         this.credentialExpirationDate = credentialExpirationDate;
     }
 
@@ -141,7 +141,7 @@
         this.enabled = enabled;
     }
 
-    public void setExpirationDate(DateTime expirationDate) {
+    public void setExpirationDate(LocalDate expirationDate) {
         this.expirationDate = expirationDate;
     }