More tweaking the user controller