fix current_user errors