Improve profile-handling on names-screen, fixes #26