do not wrap userfields; sbkopi needs similar elements for logged in and not logged in users
merge conflict
Merge branch 'develop' into feature/762_sbkopi
Merge branch 'feature/762_sbkopi' into develop