Merge "Fix bug where sometimes the full backup pw would not be validated"