Fix error popup followed bu success popup