Put attr_reader in with all of the other instance methods

This makes the grouping make a little more sense
Merge pull request #15154 from msgehard/move_password_field

Put attr_reader in with all of the other instance methods