Merged user controller from stable-jda