diff --git a/frontend/src/scripts/index.js b/frontend/src/scripts/index.js
index 4d5b0bc..7ae9593 100644
--- a/frontend/src/scripts/index.js
+++ b/frontend/src/scripts/index.js
@@ -101,6 +101,7 @@ class Main extends Component {
                     this.setState({login_status: json})
                 })
                 this.setState({
+                    showRacerModalWindow: false,
                     status_text: data.success,
                     status: "success",
                 })
@@ -116,6 +117,13 @@ class Main extends Component {
             })
         });
     }
+    handleChange = (event) => {
+        const { target } = event;
+        this.setState((prevState) => ({
+            ...prevState,
+            racer: {...prevState.racer, [target.name]: target.value,}
+        }));
+    };
     togglefaq(){
         this.setState({faq: !this.state.faq});
     }
@@ -365,27 +373,27 @@ class Main extends Component {
                     <input type="hidden" name="invoice_id" value={this.state.racer.invoice_id} />
                     <div class="mb-3">
                         <label for="first_name" class="form-label">Jméno</label>
-                        <input type="text" class="form-control" id="first_name" name="first_name" value={this.state.racer.first_name} />
+                        <input type="text" class="form-control" id="first_name" name="first_name" value={this.state.racer.first_name} onChange={(e) => this.handleChange(e)} />
                     </div>
                     <div class="mb-3">
                         <label for="last_name" class="form-label">Přijmení</label>
-                        <input type="text" class="form-control" id="last_name" name="last_name"  value={this.state.racer.last_name}/>
+                        <input type="text" class="form-control" id="last_name" name="last_name"  value={this.state.racer.last_name} onChange={(e) => this.handleChange(e)}/>
                     </div>
                     <div class="mb-3">
                         <label for="email" class="form-label">Emailová adresa (volitelné)</label>
-                        <input type="email" class="form-control" id="email" name="email"  value={this.state.racer.email}/>
+                        <input type="email" class="form-control" id="email" name="email"  value={this.state.racer.email} onChange={(e) => this.handleChange(e)}/>
                     </div>
                     <div class="mb-3">
                         <label for="date_of_birth" class="form-label">Datum narození</label>
-                        <input type="date" class="form-control" id="date_of_birth" name="date_of_birth" max={new Date().toJSON().slice(0, 10)}  value={this.state.racer.date_of_birth}/>
+                        <input type="date" class="form-control" id="date_of_birth" name="date_of_birth" max={new Date().toJSON().slice(0, 10)}  value={this.state.racer.date_of_birth} onChange={(e) => this.handleChange(e)}/>
                     </div>
                     <div class="mb-3">
                         <label for="phone" class="form-label">Telefonní číslo (volitelné)</label>
-                        <input type="text" class="form-control" id="phone" name="phone"  value={this.state.racer.phone}/>
+                        <input type="text" class="form-control" id="phone" name="phone"  value={this.state.racer.phone} onChange={(e) => this.handleChange(e)}/>
                     </div>
                     <div class="mb-3">
                         <label for="phone" class="form-label">Team (volitelné)</label>
-                        <input type="text" class="form-control" id="team" name="team"  value={this.state.racer.team}/>
+                        <input type="text" class="form-control" id="team" name="team"  value={this.state.racer.team} onChange={(e) => this.handleChange(e)} />
                     </div>
                     <button type="submit" class="btn btn-primary">Vyměnit závodníka</button>
                 </form>