diff --git a/moodico/users/views.py b/moodico/users/views.py
index 56783d0..264c20f 100644
--- a/moodico/users/views.py
+++ b/moodico/users/views.py
@@ -9,6 +9,8 @@
 from .utils import login_or_kakao_required
 from moodico.users.models import UserProfile
 from moodico.products.views import get_liked_products_color_info
+from django.contrib.auth.models import User
+import secrets
 
 # Create your views here.
 def signup_view(request):
@@ -68,14 +70,34 @@ def kakao_callback(request: HttpRequest):
     nickname = profile_data.get("properties", {}).get("nickname")
     profile_image = profile_data.get("properties", {}).get("profile_image")
 
-    print("DEBUG nickname:", nickname)  # 확인용
+    kakao_id = profile_data.get("id")
+    email = profile_data.get("kakao_account", {}).get("email")  # optional email field
+
+    # Django User username must be unique, so prepend something like 'kakao_'
+    username = f'kakao_{kakao_id}'
+
+    # Get or create Django User
+    user, created = User.objects.get_or_create(
+        username=username,
+        defaults={
+            'email': email or '',
+            'first_name': nickname or '',
+            'password': secrets.token_urlsafe(12)
+        }
+    )
+
+    # create or update UserProfile for kakao users
+    profile, _ = UserProfile.objects.get_or_create(user=user)
+
+    # Log the user in
+    login(request, user)
 
-    # 세션에 저장
     request.session["access_token"] = access_token
     request.session["nickname"] = nickname
     request.session["profile_image"] = profile_image
 
-    return redirect("main")  # 로그인 페이지에서 프로필 보여주기
+    return redirect("main")
+
 
 
 def kakao_profile(request):
diff --git a/templates/users/login.html b/templates/users/login.html
index 8feff20..5bcc74c 100644
--- a/templates/users/login.html
+++ b/templates/users/login.html
@@ -9,7 +9,7 @@
 {% if user.is_authenticated %}
 <div class="login-container">
     <div class="login-box" style="text-align: center;">
-        <h2 style="margin-bottom: 20px;">환영합니다, {{ user.username }}님</h2>
+        <h2 style="margin-bottom: 20px;">환영합니다, {{ user.first_name | default:user.username }}님</h2>
         <a href="{% url 'profile' %}" style="
             padding: 10px 20px;
             background-color: mediumpurple;
@@ -35,34 +35,6 @@ <h2 style="margin-bottom: 20px;">환영합니다, {{ user.username }}님</h2>
         </form>
     </div>
 </div>
-{% elif request.session.nickname %}
-<div class="login-container">
-    <div class="login-box" style="text-align: center;">
-        <h2 style="margin-bottom: 20px;">환영합니다, {{ request.session.nickname }}님</h2>
-        <a href="{% url 'profile' %}" style="
-                padding: 10px 20px;
-                background-color: #555;
-                color: white;
-                border: none;
-                border-radius: 5px;
-                cursor: pointer;
-                font-size: 16px;
-                text-decoration: none;
-                margin-right: 10px;
-            ">프로필</a>
-        <a href="{% url 'kakao_logout' %}" style="
-            display: inline-block;
-            padding: 10px 20px;
-            background-color: #333;
-            color: white;
-            border: none;
-            border-radius: 5px;
-            cursor: pointer;
-            font-size: 16px;
-            text-decoration: none;
-        ">카카오 로그아웃</a>
-    </div>
-</div>
 {% else %}
 
 <div class="login-container">