filling editaccount fields
Fixing missing code
Merge branch 'master' of https://github.com/RICJ2/CJ2