Bug fixes in current_user assignment.