Fixed current_user api methods