First of several patches on the path to assword!