Comment 1 for bug 1331370

I agree the current design is confusing and inconsistent.

I think a great solution would be your second solution where we could combine both the settings and the change password sections that currently exist. Attached is what I'm thinking the modal could look like.