diff --git a/LichessClientTG_bot/bot.py b/LichessClientTG_bot/bot.py
index 88d1b93..1ce7e62 100644
--- a/LichessClientTG_bot/bot.py
+++ b/LichessClientTG_bot/bot.py
@@ -558,7 +558,8 @@ class LichessBot:
         user_exists = await self.lichess_api.check_user_exists(username)
         if not user_exists:
             await update.message.reply_text(
-                t('user_not_found', lang, username=username)
+                t('user_not_found', lang, username=username) + '\n\n' + t('addgamer_prompt', lang),
+                parse_mode='HTML'
             )
             return WAITING_FOR_USERNAME
         
@@ -569,13 +570,10 @@ class LichessBot:
         if existing_gamer:
             # Player is already being tracked by this user
             await update.message.reply_text(
-                t('gamer_already_added', lang, username=username)
+                t('gamer_already_added', lang, username=username) + '\n\n' + t('addgamer_prompt', lang),
+                parse_mode='HTML'
             )
-            # Clear awaiting flag
-            try:
-                context.user_data['awaiting_addgamer_username'] = False
-            except Exception:
-                pass
+            # Keep awaiting flag - don't clear it, so user can try again
             return
         
         # Add gamer to database (without token)
@@ -594,13 +592,10 @@ class LichessBot:
         # If add_user_gamer returned False, it means the pair already exists (shouldn't happen after our check, but just in case)
         if not added:
             await update.message.reply_text(
-                t('gamer_already_added', lang, username=username)
+                t('gamer_already_added', lang, username=username) + '\n\n' + t('addgamer_prompt', lang),
+                parse_mode='HTML'
             )
-            # Clear awaiting flag
-            try:
-                context.user_data['awaiting_addgamer_username'] = False
-            except Exception:
-                pass
+            # Keep awaiting flag - don't clear it, so user can try again
             return
         
         # Set default period to 1 hour (60 minutes) for new gamer