fixing weird email behaviour and one missing url