[#e1] Normal log in working again
Merge branch 'extra/1_login_popup' into extra/2_integration_tests