diff --git a/src/sections/loadGame/chessComInput.tsx b/src/sections/loadGame/chessComInput.tsx
index 1223c02f..1976ceb1 100644
--- a/src/sections/loadGame/chessComInput.tsx
+++ b/src/sections/loadGame/chessComInput.tsx
@@ -23,7 +23,7 @@ export default function ChessComInput({ onSelect }: Props) {
     "chesscom-username",
     ""
   );
-  const [chessComUsername, setChessComUsername] = useState("");
+  const [chessComUsername, setChessComUsername] = useState(rawStoredValue?.split(",")[0] ?? "");
   const [hasEdited, setHasEdited] = useState(false);
 
   const storedValues = useMemo(() => {
@@ -70,11 +70,12 @@ export default function ChessComInput({ onSelect }: Props) {
     setHasEdited(true);
   };
 
-  const debouncedUsername = useDebounce(chessComUsername, 300);
+  const debouncedUsername = useDebounce(chessComUsername, 450);
 
   const {
     data: games,
-    isFetching,
+    isRefetching,
+    isLoading,
     isError,
   } = useQuery({
     queryKey: ["CCUserGames", debouncedUsername],
@@ -128,6 +129,8 @@ export default function ChessComInput({ onSelect }: Props) {
         />
       </FormControl>
 
+      {isRefetching && <CircularProgress sx={{ ml: 2 }} />}
+
       {debouncedUsername && (
         <Grid
           container
@@ -137,7 +140,7 @@ export default function ChessComInput({ onSelect }: Props) {
           minHeight={100}
           size={12}
         >
-          {isFetching ? (
+          {isLoading ? (
             <CircularProgress />
           ) : isError ? (
             <span style={{ color: "salmon" }}>
diff --git a/src/sections/loadGame/lichessInput.tsx b/src/sections/loadGame/lichessInput.tsx
index eab76cd2..d0c4bfdd 100644
--- a/src/sections/loadGame/lichessInput.tsx
+++ b/src/sections/loadGame/lichessInput.tsx
@@ -23,7 +23,7 @@ export default function LichessInput({ onSelect }: Props) {
     "lichess-username",
     ""
   );
-  const [lichessUsername, setLichessUsername] = useState("");
+const [lichessUsername, setLichessUsername] = useState(rawStoredValue?.split(",")[0] ?? "");
   const [hasEdited, setHasEdited] = useState(false);
 
   const storedValues = useMemo(() => {
@@ -69,11 +69,12 @@ export default function LichessInput({ onSelect }: Props) {
     setHasEdited(true);
   };
 
-  const debouncedUsername = useDebounce(lichessUsername, 500);
+  const debouncedUsername = useDebounce(lichessUsername, 450);
 
   const {
     data: games,
-    isFetching,
+    isLoading,
+    isRefetching,
     isError,
   } = useQuery({
     queryKey: ["LichessUserGames", debouncedUsername],
@@ -127,6 +128,8 @@ export default function LichessInput({ onSelect }: Props) {
         />
       </FormControl>
 
+      {isRefetching && <CircularProgress sx={{ ml: 2 }} />}
+
       {debouncedUsername && (
         <Grid
           container
@@ -136,7 +139,7 @@ export default function LichessInput({ onSelect }: Props) {
           minHeight={100}
           size={12}
         >
-          {isFetching ? (
+          {isLoading ? (
             <CircularProgress />
           ) : isError ? (
             <span style={{ color: "salmon" }}>