diff --git a/prototype/src/main/resources/templates/register.html b/prototype/src/main/resources/templates/register.html
index e1ca4ea..b7ae69d 100644
--- a/prototype/src/main/resources/templates/register.html
+++ b/prototype/src/main/resources/templates/register.html
@@ -20,7 +20,7 @@
             <div>
                <label for="username">Email Adresse</label>
                <input class="full-width" type="text" name="username" placeholder="Email Adresse" id="username"
-                      pattern="[^@]+@[^\.]+\..+" required>
+                      pattern="[^@\s]+@[^\.\s]+\.[^\s]+" required>
             </div>
             <div>
                <label for="password">Passwort</label>
diff --git a/prototype/src/main/resources/templates/user/settings.html b/prototype/src/main/resources/templates/user/settings.html
index 3348166..8bae9f9 100644
--- a/prototype/src/main/resources/templates/user/settings.html
+++ b/prototype/src/main/resources/templates/user/settings.html
@@ -28,7 +28,7 @@
             <div>
                 <div class="input-icon">
                     <input class="full-width" type="text" name="email" th:value="${user.email}"
-                           pattern="[^@]+@[^\.]+\..+" required/>
+                           pattern="[^@\s]+@[^\.\s]+\.[^\s]+" required/>
                     <button> Email-Adresse ändern</button>
                 </div>
             </div>