diff --git a/frontend/src/components/Dashboard/QuickStartWizard.tsx b/frontend/src/components/Dashboard/QuickStartWizard.tsx
index 23dca52..c42553d 100644
--- a/frontend/src/components/Dashboard/QuickStartWizard.tsx
+++ b/frontend/src/components/Dashboard/QuickStartWizard.tsx
@@ -135,8 +135,16 @@ const QuickStartWizard: React.FC<QuickStartWizardProps> = ({
 
       // Step 3: Create policy
       const policyName = `${setupData.bucketName}-${setupData.policyType}-policy`;
+      
+      // Map policy types to template keys
+      const templateKey = setupData.policyType === 'readwrite' 
+        ? 'bucketFullAccess' 
+        : setupData.policyType === 'readonly' 
+        ? 'bucketReadOnly' 
+        : 'bucketWriteOnly';
+      
       const policyJson = policyService.generatePolicyFromTemplate(
-        `bucket${setupData.policyType.charAt(0).toUpperCase() + setupData.policyType.slice(1).replace('only', 'Only')}`,
+        templateKey,
         setupData.bucketName
       );
       
@@ -220,21 +228,22 @@ const QuickStartWizard: React.FC<QuickStartWizardProps> = ({
             <TextField
               autoFocus
               margin="normal"
-              label="Username"
+              label="Username (Access Key)"
               fullWidth
               value={setupData.userName}
               onChange={(e) => setSetupData({ ...setupData, userName: e.target.value })}
               error={!!error && activeStep === 1}
+              helperText="This will be the user's Access Key for MinIO"
             />
             <TextField
               margin="normal"
-              label="Password"
+              label="Password (Secret Key)"
               type={showPassword ? 'text' : 'password'}
               fullWidth
               value={setupData.userPassword}
               onChange={(e) => setSetupData({ ...setupData, userPassword: e.target.value })}
               error={!!error && activeStep === 1}
-              helperText={error || "Min 8 chars, uppercase, lowercase, and number required"}
+              helperText={error || "This will be the user's Secret Key - Min 8 chars, uppercase, lowercase, and number"}
               InputProps={{
                 endAdornment: (
                   <InputAdornment position="end">
@@ -317,7 +326,7 @@ const QuickStartWizard: React.FC<QuickStartWizardProps> = ({
                     <Person color="primary" />
                   </ListItemIcon>
                   <ListItemText
-                    primary="User"
+                    primary="User (Access Key)"
                     secondary={setupData.userName}
                   />
                 </ListItem>
@@ -326,7 +335,7 @@ const QuickStartWizard: React.FC<QuickStartWizardProps> = ({
                     <VpnKey color="primary" />
                   </ListItemIcon>
                   <ListItemText
-                    primary="Password"
+                    primary="Password (Secret Key)"
                     secondary="••••••••••••••••"
                   />
                 </ListItem>