User Image fixes
User Image fixes
Merge pull request #329 from sandal-smuggler/User-Profile-Picture-Fixes

User profile picture fixes