Merge "Check password is correct by checking hash"