diff --git a/src/components/FocusGroupModerator.tsx b/src/components/FocusGroupModerator.tsx
index 8da31a8d..530655a9 100755
--- a/src/components/FocusGroupModerator.tsx
+++ b/src/components/FocusGroupModerator.tsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect, useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 import { useNavigate, useLocation } from 'react-router-dom';
 import { useNavigation } from '@/contexts/NavigationContext';
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -57,6 +58,7 @@ export default function FocusGroupModerator({
   preSelectedParticipants = []
 }: FocusGroupModeratorProps = {}) {
   const navigate = useNavigate();
+  const { t } = useTranslation();
   const { setPreviousRoute, navigationState, clearNavigationState } = useNavigation();
 
   // Tab state
@@ -496,9 +498,9 @@ export default function FocusGroupModerator({
 
         <Tabs value={activeTab} onValueChange={setActiveTab}>
           <TabsList className="grid w-full grid-cols-3 mb-6">
-            <TabsTrigger value="setup">Setup</TabsTrigger>
-            <TabsTrigger value="participants">Participant Selection</TabsTrigger>
-            <TabsTrigger value="review">Review & Edit</TabsTrigger>
+            <TabsTrigger value="setup">{t('focus_group_setup.tab_setup')}</TabsTrigger>
+            <TabsTrigger value="participants">{t('focus_group_setup.tab_participant_selection')}</TabsTrigger>
+            <TabsTrigger value="review">{t('focus_group_setup.tab_review_edit')}</TabsTrigger>
           </TabsList>
 
           <TabsContent value="setup">
diff --git a/src/components/UserCreator.tsx b/src/components/UserCreator.tsx
index ad56fedf..dcf108d3 100755
--- a/src/components/UserCreator.tsx
+++ b/src/components/UserCreator.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
@@ -126,6 +127,7 @@ const formSchema = z.object({
 });
 
 export default function UserCreator({ targetFolderId, targetFolderName }: UserCreatorProps) {
+  const { t } = useTranslation();
   const [userCount, setUserCount] = useState(1);
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [isAutoLoginInProgress, setIsAutoLoginInProgress] = useState(false);
@@ -576,12 +578,12 @@ export default function UserCreator({ targetFolderId, targetFolderName }: UserCr
         <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
           <Tabs defaultValue="basic">
             <TabsList className="grid w-full grid-cols-6 sticky top-0 z-10 bg-card">
-              <TabsTrigger value="basic">Basic</TabsTrigger>
-              <TabsTrigger value="attitudinal">Attitudinal</TabsTrigger>
-              <TabsTrigger value="personality">Personality</TabsTrigger>
-              <TabsTrigger value="demographics">Demographics</TabsTrigger>
-              <TabsTrigger value="lifestyle">Lifestyle</TabsTrigger>
-              <TabsTrigger value="extended">Extended</TabsTrigger>
+              <TabsTrigger value="basic">{t('persona_editor.tab_basic')}</TabsTrigger>
+              <TabsTrigger value="attitudinal">{t('persona_editor.tab_attitudinal')}</TabsTrigger>
+              <TabsTrigger value="personality">{t('persona_editor.tab_personality')}</TabsTrigger>
+              <TabsTrigger value="demographics">{t('persona_editor.tab_demographics')}</TabsTrigger>
+              <TabsTrigger value="lifestyle">{t('persona_editor.tab_lifestyle')}</TabsTrigger>
+              <TabsTrigger value="extended">{t('persona_editor.tab_extended')}</TabsTrigger>
             </TabsList>
             
             <TabsContent value="basic" className="mt-6">