diff --git a/PeerAtCodeFramework.jar b/PeerAtCodeFramework.jar
index e10f0c9..6fed303 100644
Binary files a/PeerAtCodeFramework.jar and b/PeerAtCodeFramework.jar differ
diff --git a/src/dev/peerat/backend/Main.java b/src/dev/peerat/backend/Main.java
index 2ebb89f..4956290 100644
--- a/src/dev/peerat/backend/Main.java
+++ b/src/dev/peerat/backend/Main.java
@@ -59,18 +59,20 @@ public class Main{
 			for(Entry<String, Object> entry : json.entries()) params.put(entry.getKey(), entry.getValue());
 			auth = new JwtAuthenticator<PeerAtUser>().configure(
 					(builder) -> builder.setExpectedIssuer(config.getTokenIssuer()),
-					(claims) -> {
+					(claims, user) -> {
 						claims.setIssuer(config.getTokenIssuer());
 						claims.setExpirationTimeMinutesInTheFuture(config.getTokenExpiration());
+						user.write(claims);
 					}, 
 					(claims) -> new PeerAtUser(claims),
 					params);
 		}else{
 			auth = new JwtAuthenticator<PeerAtUser>().configure(
 					(builder) -> builder.setExpectedIssuer(config.getTokenIssuer()),
-					(claims) -> {
+					(claims, user) -> {
 						claims.setIssuer(config.getTokenIssuer());
 						claims.setExpirationTimeMinutesInTheFuture(config.getTokenExpiration());
+						user.write(claims);
 					}, 
 					(claims) -> new PeerAtUser(claims));
 			JsonMap json = new JsonMap();
diff --git a/src/dev/peerat/backend/model/PeerAtUser.java b/src/dev/peerat/backend/model/PeerAtUser.java
index 28d9642..84b28d8 100644
--- a/src/dev/peerat/backend/model/PeerAtUser.java
+++ b/src/dev/peerat/backend/model/PeerAtUser.java
@@ -14,7 +14,6 @@ public class PeerAtUser extends dev.peerat.framework.User{
 		this.id = ((Long) claims.getClaimValue("id")).intValue();
 	}
 	
-	@Override
 	public void write(JwtClaims claims){
 		claims.setClaim("id", this.id);
 	}