Fixing and improving account helper