Password fixes

NO NOT MERGE YET