diff --git a/src/main/java/org/kickerelo/kickerelo/views/Enter1vs1View.java b/src/main/java/org/kickerelo/kickerelo/views/Enter1vs1View.java
index 53745c9..016d00d 100644
--- a/src/main/java/org/kickerelo/kickerelo/views/Enter1vs1View.java
+++ b/src/main/java/org/kickerelo/kickerelo/views/Enter1vs1View.java
@@ -38,6 +38,9 @@ public class Enter1vs1View extends VerticalLayout {
             try {
                 eloService.enterResult1vs1(winnerSelect.getValue(), loserSelect.getValue(), loserGoals.getValue().shortValue());
                 Notification.show("Gespeichert").addThemeVariants(NotificationVariant.LUMO_SUCCESS);
+                winnerSelect.setValue(null);
+                loserSelect.setValue(null);
+                loserGoals.setValue(0);
             } catch (NoSuchPlayerException err) {
                 Notification.show("Unbekannter Spieler").addThemeVariants(NotificationVariant.LUMO_ERROR);
             } catch (DuplicatePlayerException err) {
@@ -47,7 +50,9 @@ public class Enter1vs1View extends VerticalLayout {
             } catch (InvalidDataException err) {
                 Notification.show("Verliertore falsch").addThemeVariants(NotificationVariant.LUMO_ERROR);
             }
+            e.getSource().setEnabled(true);
         });
+        saveButton.setDisableOnClick(true);
 
 
 
diff --git a/src/main/java/org/kickerelo/kickerelo/views/Enter2vs2View.java b/src/main/java/org/kickerelo/kickerelo/views/Enter2vs2View.java
index e84fa66..23829bc 100644
--- a/src/main/java/org/kickerelo/kickerelo/views/Enter2vs2View.java
+++ b/src/main/java/org/kickerelo/kickerelo/views/Enter2vs2View.java
@@ -45,6 +45,11 @@ public class Enter2vs2View extends VerticalLayout {
             try {
                 eloService.enterResult2vs2(winnerFrontSelect.getValue(), winnerBackSelect.getValue(), loserFrontSelect.getValue(), loserBackSelect.getValue(), loserGoals.getValue().shortValue());
                 Notification.show("Gespeichert").addThemeVariants(NotificationVariant.LUMO_SUCCESS);
+                winnerFrontSelect.setValue(null);
+                winnerBackSelect.setValue(null);
+                loserFrontSelect.setValue(null);
+                loserBackSelect.setValue(null);
+                loserGoals.setValue(0);
             } catch (NoSuchPlayerException err) {
                 Notification.show("Unbekannter Spieler").addThemeVariants(NotificationVariant.LUMO_ERROR);
             } catch (DuplicatePlayerException err) {
@@ -54,7 +59,9 @@ public class Enter2vs2View extends VerticalLayout {
             } catch (InvalidDataException err) {
                 Notification.show("Verliertore falsch").addThemeVariants(NotificationVariant.LUMO_ERROR);
             }
+            e.getSource().setEnabled(true);
         });
+        saveButton.setDisableOnClick(true);
 
 
         // Use custom CSS classes to apply styling. This is defined in