fix #10587
Merge branch '10587-login_in_konvenator'