fix current_user