Merge "Save password requirements on the right user" into pi-dev