Improve handling of user picture