fix enable account and temporary workaroudn for set password