Fix Profile Issues

1. Fix Profile update
2. Fix Account Type selection