the previous implementation caused some weird side effects. 
Users could sometimes not login at all. Reverting for now
fixed NPE when accessing the login page
creating new users/roles no longer worked properly