Pulled out the user injection into the options into its own method.