diff --git a/headscale-auto-register.sh b/headscale-auto-register.sh
index c01e763..ad0d392 100755
--- a/headscale-auto-register.sh
+++ b/headscale-auto-register.sh
@@ -560,11 +560,18 @@ EOF
         -H "Content-Type: application/json" \
         -d "$JSON_DATA")
 
-    # pharmacy_code 추출
-    PHARMACY_CODE=$(echo "$RESPONSE" | grep -oP '"pharmacy_code":"[^"]*"' | cut -d'"' -f4)
+    # 성공 여부 먼저 확인
+    if ! echo "$RESPONSE" | grep -q '"success":true'; then
+        echo -e "${RED}✗ 약국 생성 실패${NC}"
+        echo "$RESPONSE"
+        return 1
+    fi
+
+    # pharmacy_code 추출 (pharmacy 객체 내부)
+    PHARMACY_CODE=$(echo "$RESPONSE" | grep -oP '"pharmacy_code":"\K[^"]+' | head -1)
 
     if [ -z "$PHARMACY_CODE" ]; then
-        echo -e "${RED}✗ 약국 생성 실패${NC}"
+        echo -e "${RED}✗ pharmacy_code 추출 실패${NC}"
         echo "$RESPONSE"
         return 1
     fi