Revert "UserController bugfix"

This reverts commit 680fb7c38f48a2e1f4902e21f2ae9c11e11c6216.