fix #20: Split account in domain and user