Merge pull request #5816 from JonnyTischbein/issue_failed_login_layout