Registration flow fix