Less literal loading/saving

Will make a possible future per profile password option slightly less
ugly to implement.