Fixes: #2407 Improved user picture handling