Add login assertion; improve escaping