More UserAccount fixes