Take into account int user id
Merge branch 'bumboarder'
cleaner handling of sprintly error 500.