More fixes to the $current_user code.