Moving reused methods to Accounts mixin
Mrg Juan's changes, stop shadowing
Update