SSO + Chwala, and some improvements

Authored by machniak on Nov 23 2018, 4:45 PM.