fixed a test, fixed account settings page [MJ-697]