add few fixes for installer clients save