diff --git a/apps/authentication/api/v1/serializers/jwt.py b/apps/authentication/api/v1/serializers/jwt.py
index 7fde96e..8d9679a 100644
--- a/apps/authentication/api/v1/serializers/jwt.py
+++ b/apps/authentication/api/v1/serializers/jwt.py
@@ -53,5 +53,7 @@ class CustomizedTokenObtainPairSerializer(TokenObtainPairSerializer):  # noqa
 
         # Add custom claims
         token['name'] = user.username
+        token['mobile'] = user.mobile
+        token['national_code'] = user.national_code
 
         return token
diff --git a/apps/captcha_app/api/v1/utils.py b/apps/captcha_app/api/v1/utils.py
index efec848..14cb83a 100644
--- a/apps/captcha_app/api/v1/utils.py
+++ b/apps/captcha_app/api/v1/utils.py
@@ -1,13 +1,11 @@
-import os.path
-import random
-
 from rest_captcha.settings import api_settings as settings
-from django.conf import settings as django_setting
 from PIL import ImageFont, ImageDraw, Image
 from .serializers import noise_default
 from django.core.cache import caches
-from rest_captcha import captcha
 from io import BytesIO as StringIO
+from rest_captcha import captcha
+import os.path
+import random
 
 cache = caches[settings.CAPTCHA_CACHE]
 
@@ -15,6 +13,9 @@ path = os.path.dirname(__file__) + '/'  # noqa
 
 
 def random_char_challenge(length):
+    """
+    generate random captcha code
+    """
     chars = '123456789'
     ret = ''
     for i in range(length):
@@ -23,6 +24,9 @@ def random_char_challenge(length):
 
 
 def generate_image(word):
+    """
+    generate captcha image
+    """
     font = ImageFont.load_default()
     size = settings.CAPTCHA_IMAGE_SIZE