Added untested password functionality