SSO + Chwala, and some improvements

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