diff --git a/src/onboarding/onboarding-create-user.ts b/src/onboarding/onboarding-create-user.ts
index 837bba1b7d..b5b06b43cb 100644
--- a/src/onboarding/onboarding-create-user.ts
+++ b/src/onboarding/onboarding-create-user.ts
@@ -130,7 +130,7 @@ class OnboardingCreateUser extends LitElement {
     );
     this.addEventListener("keypress", (ev) => {
       if (ev.keyCode === 13) {
-        this._submitForm();
+        this._submitForm(ev);
       }
     });
   }
@@ -152,7 +152,8 @@ class OnboardingCreateUser extends LitElement {
     }
   }
 
-  private async _submitForm(): Promise<void> {
+  private async _submitForm(ev): Promise<void> {
+    ev.preventDefault();
     if (!this._name || !this._username || !this._password) {
       this._errorMsg = "required_fields";
       return;
diff --git a/src/panels/config/users/ha-dialog-add-user.js b/src/panels/config/users/ha-dialog-add-user.js
index 08c0319919..dd710bb8bb 100644
--- a/src/panels/config/users/ha-dialog-add-user.js
+++ b/src/panels/config/users/ha-dialog-add-user.js
@@ -108,7 +108,7 @@ class HaDialogAddUser extends LocalizeMixin(PolymerElement) {
     super.ready();
     this.addEventListener("keypress", (ev) => {
       if (ev.keyCode === 13) {
-        this._createUser();
+        this._createUser(ev);
       }
     });
   }
@@ -131,7 +131,8 @@ class HaDialogAddUser extends LocalizeMixin(PolymerElement) {
     }
   }
 
-  async _createUser() {
+  async _createUser(ev) {
+    ev.preventDefault();
     if (!this._name || !this._username || !this._password) return;
 
     this._loading = true;