diff --git a/js/components/Login.js b/js/components/Login.js
index bfa99e4..174677b 100644
--- a/js/components/Login.js
+++ b/js/components/Login.js
@@ -3,7 +3,10 @@ import React from 'react';
 import {connect} from 'react-redux';
 import Router from 'next/router';
 
-import {login} from '../api';
+import {
+    login,
+    clearErrors
+} from '../api';
 
 export function Login(props) {
     return (
@@ -84,6 +87,10 @@ class LoginForm extends React.Component {
         };
     }
 
+    componentDidMount() {
+        clearErrors();
+    }
+
     tryLogin(event) {
         event.preventDefault();
         login(this.state.email, this.state.password);
diff --git a/pages/register.js b/pages/register.js
index 91ebc81..74de939 100644
--- a/pages/register.js
+++ b/pages/register.js
@@ -16,7 +16,10 @@ import {
 import { TurniereNavigation } from '../js/components/Navigation';
 import { Footer }             from '../js/components/Footer';
 import { register }           from '../js/api';
-import { verifyCredentials }  from '../js/api';
+import {
+    verifyCredentials,
+    clearErrors
+}  from '../js/api';
 
 import '../static/everypage.css';
 
@@ -43,20 +46,27 @@ export default class RegisterPage extends React.Component {
     }
 }
 
-function Register() {
-    return (
-        <Container className="py-5">
-            <Card className="shadow">
-                <CardBody>
-                    <h1 className="custom-font">Account anlegen</h1>
-                    <RegisterForm/>
-                    <div className="mt-3">
-                        <a href="/login" className="mr-3">Ich habe bereits einen Account!</a>
-                    </div>
-                </CardBody>
-            </Card>
-        </Container>
-    );
+class Register extends React.Component {
+
+    componentDidMount() {
+        clearErrors();
+    }
+
+    render() {
+        return (
+            <Container className="py-5">
+                <Card className="shadow">
+                    <CardBody>
+                        <h1 className="custom-font">Account anlegen</h1>
+                        <RegisterForm/>
+                        <div className="mt-3">
+                            <a href="/login" className="mr-3">Ich habe bereits einen Account!</a>
+                        </div>
+                    </CardBody>
+                </Card>
+            </Container>
+        );
+    }
 }
 
 class RegisterErrorList extends React.Component {