bugfix for broken double opt in in layout