Fix #1969
Merge pull request #2095 from fdlk/fix/1969

Fix #1969
Fix #2097 Close login screen after incorrect login attempt
Merge pull request #2099 from dennishendriksen/master

Fix #2097 Close login screen after incorrect login attempt
Merge branch 'master' of https://github.com/molgenis/molgenis