Move FTP settings into correct fieldset on settings page

On the settings screen there are fields "stored username" and "stored hostname". Surely these are FTP settings and therefore should sit in the "ftp settings" fieldset with the "ftp path" option?

I found these options really confusing as they are not well labelled and I didn't know what they referred to. A username could be anything... database, ftp, drupal itself...