Merge frontend changes

Otto Visserrequested to merge
frontend_additional_info into frontend_login

This merge request merges both branches with changes in the frontend

Merge request reports