User bug handler
Merge pull request #470 from sexnothing/user

User bug handler