[TASK] ADWD-1337 Modified Account management adapted