diff --git a/features/landing/frontend/src/pages/shop/ShopCheckoutPage.tsx b/features/landing/frontend/src/pages/shop/ShopCheckoutPage.tsx
index 44e476ecc..cbf4b8312 100644
--- a/features/landing/frontend/src/pages/shop/ShopCheckoutPage.tsx
+++ b/features/landing/frontend/src/pages/shop/ShopCheckoutPage.tsx
@@ -294,12 +294,12 @@ export default function ShopCheckoutPage() {
                 </div>
                 <motion.button
                   className="continue-button"
-                  onClick={handleContinueToAccount}
+                  onClick={handleContinueFromReview}
                   onMouseEnter={() => playSound('button-hover')}
                   whileHover={{ scale: 1.02 }}
                   whileTap={{ scale: 0.98 }}
                 >
-                  Continue to Account
+                  {isAuthenticated ? 'Continue to Payment' : 'Continue to Account'}
                 </motion.button>
               </div>
             </div>
@@ -481,7 +481,8 @@ export default function ShopCheckoutPage() {
                   className="back-button"
                   onClick={() => {
                     playSound('button-click')
-                    setCurrentStep('account')
+                    // Go back to review for auth users (no account step), account for guests
+                    setCurrentStep(isAuthenticated ? 'review' : 'account')
                   }}
                   onMouseEnter={() => playSound('button-hover')}
                 >