Modifications to user controller