Feature/fix jwt