[TASK] ADWD-1337 Modified Account management adapted
Merge pull request #125 from subugoe/ADWD-1337

[TASK] ADWD-1337 Modified Account management adapted