Finish Ch 8 with addendum - Fix bugs in current_user assignment