Fixes: #1901 User image is altered by editing and saving