to-do & small simplification in username and password saving