Merge branch 'r/Derde_Sprint'
* Login errors
Merge branch 'h/login_errors' into dev