fixed account management
Merge branch 'master' of https://github.com/melkawakibi/BPSproject