diff --git a/pom.xml b/pom.xml
index 18f703b..9068ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@
       <artifactId>commons-lang3</artifactId>
       <version>3.3.2</version>
     </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
diff --git a/src/main/java/com/svlada/security/model/token/JwtTokenFactory.java b/src/main/java/com/svlada/security/model/token/JwtTokenFactory.java
index e1b4cb1..ac18e77 100644
--- a/src/main/java/com/svlada/security/model/token/JwtTokenFactory.java
+++ b/src/main/java/com/svlada/security/model/token/JwtTokenFactory.java
@@ -1,11 +1,13 @@
 package com.svlada.security.model.token;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -50,13 +52,15 @@ public class JwtTokenFactory {
         Claims claims = Jwts.claims().setSubject(userContext.getUsername());
         claims.put("scopes", userContext.getAuthorities().stream().map(s -> s.toString()).collect(Collectors.toList()));
 
-        DateTime currentTime = new DateTime();
-
+        LocalDateTime currentTime = LocalDateTime.now();
+        
         String token = Jwts.builder()
           .setClaims(claims)
           .setIssuer(settings.getTokenIssuer())
-          .setIssuedAt(currentTime.toDate())
-          .setExpiration(currentTime.plusMinutes(settings.getTokenExpirationTime()).toDate())
+          .setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
+          .setExpiration(Date.from(currentTime
+              .plusMinutes(settings.getTokenExpirationTime())
+              .atZone(ZoneId.systemDefault()).toInstant()))
           .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
         .compact();
 
@@ -68,7 +72,7 @@ public class JwtTokenFactory {
             throw new IllegalArgumentException("Cannot create JWT Token without username");
         }
 
-        DateTime currentTime = new DateTime();
+        LocalDateTime currentTime = LocalDateTime.now();
 
         Claims claims = Jwts.claims().setSubject(userContext.getUsername());
         claims.put("scopes", Arrays.asList(Scopes.REFRESH_TOKEN.authority()));
@@ -77,8 +81,10 @@ public class JwtTokenFactory {
           .setClaims(claims)
           .setIssuer(settings.getTokenIssuer())
           .setId(UUID.randomUUID().toString())
-          .setIssuedAt(currentTime.toDate())
-          .setExpiration(currentTime.plusMinutes(settings.getRefreshTokenExpTime()).toDate())
+          .setIssuedAt(Date.from(currentTime.atZone(ZoneId.systemDefault()).toInstant()))
+          .setExpiration(Date.from(currentTime
+              .plusMinutes(settings.getRefreshTokenExpTime())
+              .atZone(ZoneId.systemDefault()).toInstant()))
           .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
         .compact();
 
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 54a4b48..d322b22 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <include resource="org/springframework/boot/logging/logback/base.xml"/>
-    <logger name="org.springframework.web" level="INFO"/>     
+    <logger name="org.springframework.web" level="DEBUG"/>     
+    <logger name="org.springframework.security" level="DEBUG"/>
     <logger name="org.springframework" level="ERROR"/>
     <logger name="com.svlada" level="ALL"/>
 </configuration>
\ No newline at end of file