Remove dependance of the user controller on the option model