Picture and signature forms cannot be reordered on user account settings / manage fields

I'm playing around with rc1 and I found "user account settings / manage fields" a little bit inconsistent / confusing. I'm creating user fields, I can reorder them, as well as timezone and user name/password fields, it works nice, however, after such reorganizing, picture/signature forms completly disturbes the desired order of fields (I mean by showing between them etc). They have fixed weight and I found, that as a workaround, I can fix weights of other fields and after that not touch user edit form settings anymore. In my opinion it is not the best and flexible solution. So I created a small patch for user_field_extra_fields() which enables picture/signature forms to be reordered in a way that timezone/username fields can be. It checkes if picture/signature support is enabled. The patch also adjust the "administrative overlay" form weight to 50, so that, it is always on the bottom (I'm not convinced if similar change for this form is worth).