55a5cef783
We were always passing `officer.user` to this method, so we might as well pass the officer (since the "officer" is in the name of the method) and call `officer.user` inside the method. We're also calling `login_through_form_as` in order to remove the duplication between these two methods.