User info fixes again

Merged lain requested to merge user_info_fixes_again into develop

Merge request reports