Simplifies Edit Account page
Merge branch 'SimplifyEditAccount'